diff --git a/.bazelrc b/.bazelrc
index ff817a110e9c..247086af2541 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,6 @@
+# Disable NG CLI TTY mode
+test --action_env=NG_FORCE_TTY=false
+
 # Make TypeScript compilation fast, by keeping a few copies of the compiler
 # running as daemons, and cache SourceFile AST's to reduce parse time.
 build --strategy=TypeScriptCompile=worker
@@ -89,7 +92,7 @@ test --test_output=errors
 ################################
 
 # Use the Angular team internal GCP instance for remote execution.
-build:remote --remote_instance_name=projects/internal-200822/instances/default_instance
+build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
 build:remote --project_id=internal-200822
 
 # Starting with Bazel 0.27.0 strategies do not need to be explicitly
@@ -99,10 +102,8 @@ 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
+build:remote --remote_timeout=600
+build:remote --jobs=150
 
  # Setup the toolchain and platform for the remote build execution. The platform
 # is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
@@ -117,11 +118,6 @@ 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
 
@@ -130,15 +126,14 @@ build:remote --remote_accept_cached=true
 build:remote --cpu=k8
 build:remote --host_cpu=k8
 
+# Set up authentication mechanism for RBE
+build:remote --google_default_credentials
+
 ###############################
 # NodeJS rules settings
 # These settings are required for rules_nodejs
 ###############################
 
-# Turn on managed directories feature in Bazel
-# This allows us to avoid installing a second copy of node_modules
-common --experimental_allow_incremental_repository_updates
-
 ####################################################
 # User bazel configuration
 # NOTE: This needs to be the *last* entry in the config.
@@ -150,4 +145,4 @@ try-import .bazelrc.user
 
 # Enable runfiles even on Windows.
 # Architect resolves output files from data files, and this isn't possible without runfile support.
-test --enable_runfiles
\ No newline at end of file
+test --enable_runfiles
diff --git a/.bazelversion b/.bazelversion
index 5a3e0fb5ec48..54f6b9be19dc 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,3 +1,3 @@
-3.4.1
+4.0.0
 # [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
-# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE
\ No newline at end of file
+# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56a6364fe701..729fbb635eb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,8 +17,8 @@ orbs:
 ## IMPORTANT
 # Windows needs its own cache key because binaries in node_modules are different.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &cache_key angular_devkit-12.18-{{ checksum "yarn.lock" }}
-var_1_win: &cache_key_win angular_devkit-win-12.18-{{ checksum "yarn.lock" }}
+var_1: &cache_key v1-angular_devkit-12.18-{{ checksum "yarn.lock" }}
+var_1_win: &cache_key_win v1-angular_devkit-win-12.18-{{ checksum "yarn.lock" }}
 var_3: &default_nodeversion "12.18"
 # Workspace initially persisted by the `setup` job, and then enhanced by `setup-and-build-win`.
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
@@ -77,8 +77,8 @@ commands:
           at: *workspace_location
   setup_windows:
     steps:
-      - run: nvm install 12.1.0
-      - run: nvm use 12.1.0
+      - run: nvm install 12.13.0
+      - run: nvm use 12.13.0
       - run: npm install -g yarn@1.17.3
       - run: node --version
       - run: yarn --version
@@ -141,7 +141,7 @@ jobs:
       - restore_cache:
           keys:
             - *cache_key
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - persist_to_workspace:
           root: *workspace_location
           paths:
@@ -175,10 +175,7 @@ jobs:
               echo "This build is not over a PR, nothing to do."
             fi
       - run:
-          name: Validate "do not submit" Commits
-          command: yarn -s admin validate-do-not-submit
-      - run:
-          command: yarn -s admin validate --ci
+          command: yarn -s admin validate
 
   e2e-cli:
     parameters:
@@ -198,27 +195,26 @@ jobs:
           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.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --tmpdir=/mnt/ramdisk
+          command: |
+            mkdir /mnt/ramdisk/e2e-main
+            PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --tmpdir=/mnt/ramdisk/e2e-main
       - run:
           name: Execute CLI E2E Tests Subset with Yarn
           command: |
-            rm -rf /mnt/ramdisk/*test-project
-            PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk --glob="{tests/basic/**,tests/update/**}"
+            mkdir /mnt/ramdisk/e2e-yarn
+            PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e-yarn --glob="{tests/basic/**,tests/update/**,tests/commands/add/**}"
 
-  e2e-cli-node-10:
+  e2e-cli-node-14:
     executor:
       name: test-executor
-      nodeversion: "10.20"
-    parallelism: 4
+      nodeversion: "14.15"
+    parallelism: 6
     steps:
       - custom_attach_workspace
       - browser-tools/install-chrome
       - 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
+          command: ./.circleci/env.sh
       - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   test-browsers:
@@ -243,7 +239,7 @@ jobs:
         # 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 --ve
-      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts 
+      - 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:
@@ -264,17 +260,6 @@ jobs:
           command: yarn bazel:test
           no_output_timeout: 20m
 
-  integration:
-    executor: test-executor
-    resource_class: xlarge
-    steps:
-      - custom_attach_workspace
-      - install_python
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: 
-          command: yarn bazel:integration
-          no_output_timeout: 20m
-
   snapshot_publish:
     executor: action-executor
     resource_class: medium
@@ -282,7 +267,7 @@ jobs:
       - custom_attach_workspace
       - run:
           name: Decrypt Credentials
-          # Note: when changing the image, you might have to re-encrypt the credentials with a 
+          # 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: |
@@ -303,13 +288,12 @@ jobs:
       - restore_cache:
           keys:
             - *cache_key_win
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --frozen-lockfile --cache-folder ../.cache/yarn
       - run: yarn build
       - save_cache:
           key: *cache_key_win
           paths:
-            # Get cache dir on windows via `yarn cache dir`
-            - C:\Users\circleci\AppData\Local\Yarn\Cache\v4
+            - ~/.cache/yarn
       # Only jobs downstream from this one will see the updated workspace
       # https://circleci.com/blog/deep-diving-into-circleci-workspaces/
       - persist_to_workspace:
@@ -324,7 +308,7 @@ jobs:
       - setup_windows
       # 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/**,tests/i18n/extract-ivy*.ts}" }
-             
+
   e2e-cli-win:
     executor: windows-executor
     parallelism: 4
@@ -348,10 +332,6 @@ workflows:
       - build:
           requires:
             - setup
-          filters:
-            branches:
-              ignore:
-              - /docs-preview/
       - e2e-cli:
           post-steps:
             - store_artifacts:
@@ -385,7 +365,7 @@ workflows:
               only:
                 - renovate/angular
                 - master
-      - e2e-cli-node-10:
+      - e2e-cli-node-14:
           <<: *only_release_branches
           requires:
             - e2e-cli
@@ -395,15 +375,12 @@ workflows:
 
       # Bazel jobs
       # These jobs only really depend on Setup, but the build job is very quick to run (~35s) and
-      # will catch any build errors before proceeding to the more lengthy and resource intensive 
+      # will catch any build errors before proceeding to the more lengthy and resource intensive
       # Bazel jobs.
       - test:
           requires:
             - build
-      - integration:
-          requires:
-            - build
-      
+
       # Windows jobs
       # These jobs only run after their non-windows counterparts finish successfully.
       # This isn't strictly necessary as there is no artifact dependency, but helps economize
@@ -422,7 +399,7 @@ workflows:
           requires:
             - setup-and-build-win
             - e2e-cli
-      
+
       # Publish jobs
       - snapshot_publish:
           <<: *only_release_branches
@@ -430,3 +407,30 @@ workflows:
             - build
             - test
             - e2e-cli
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - 11.2.x
+    jobs:
+      # Linux jobs
+      - setup
+      - build:
+          requires:
+            - setup
+      - e2e-cli:
+          name: e2e-cli-nightly
+          requires:
+            - build
+      - e2e-cli:
+          name: e2e-cli-ve-nightly
+          ve: true
+          requires:
+            - build
+      - test-browsers:
+          requires:
+            - build
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
index 36bb9ef9072b..c24ab5b7ef34 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -27,7 +27,7 @@ Existing issues often contain information about workarounds, resolution, or prog
 - [ ] add
 - [ ] update
 - [ ] lint
-- [ ] xi18n
+- [ ] extract-i18n
 - [ ] run
 - [ ] config
 - [ ] help
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
index 5efe1953908c..9210f5135779 100644
--- a/.github/ISSUE_TEMPLATE/2-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -28,7 +28,7 @@ Existing issues often contain information about workarounds, resolution, or prog
 - [ ] add
 - [ ] update
 - [ ] lint
-- [ ] xi18n
+- [ ] extract-i18n
 - [ ] run
 - [ ] config
 - [ ] help
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 6fc65fe348f2..ee4ebcbd2af8 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -14,11 +14,13 @@ merge:
     failureText: "The following checks are failing:"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
-  mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
-\nPlease help to unblock it by resolving these conflicts. Thanks!"
+  mergeConflictComment: >-
+    Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
+
+    Please help to unblock it by resolving these conflicts. Thanks!
 
   # label to monitor
-  mergeLabel: "PR action: merge"
+  mergeLabel: "action: merge"
 
   # list of checks that will determine if the merge label can be added
   checks:
@@ -26,16 +28,15 @@ merge:
     noConflict: true
     # whether the PR should have all reviews completed.
     requireReviews: true
-    # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
+    # list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: major")
     requiredLabels:
-      - "PR target: *"
+      - "target: *"
       - "cla: yes"
 
     # list of labels that a PR shouldn't have, checked after the required labels with a regexp
     forbiddenLabels:
-      - "PR target: TBD"
-      - "PR action: cleanup"
-      - "PR action: review"
+      - "action: cleanup"
+      - "action: review"
       - "PR state: blocked"
       - "cla: no"
 
@@ -48,7 +49,6 @@ merge:
       - "ci/circleci: validate"
       - "ci/circleci: test"
       - "ci/circleci: test-win"
-      - "ci/circleci: integration"
       - "ci/circleci: e2e-cli"
       - "ci/circleci: e2e-cli-ve"
       - "ci/circleci: test-browsers"
@@ -58,13 +58,18 @@ merge:
   # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
   # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
   # {{PLACEHOLDER}} will be replaced by the list of failing checks
-  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
-\n{{PLACEHOLDER}}
-\n
-\n**If you want your PR to be merged, it has to pass all the CI checks.**
-\n
-\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
+  mergeRemovedComment: >-
+    I see that you just added the `{{MERGE_LABEL}}` label, but the following
+    checks are still failing:
 
+    {{PLACEHOLDER}}
+     
+    **If you want your PR to be merged, it has to pass all the CI checks.**
+     
+    If you can't get the PR to a green state due to flakes or broken master,
+    please try rebasing to master and/or restarting the CI job. If that fails
+    and you believe that the issue is not due to your change, please contact the
+    caretaker and ask for help.
 # options for the triage plugin
 triage:
   # set to true to disable
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3d870a358086..6499bb344192 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,8 +9,8 @@ updates:
       prefix: "build"
     labels:
       - "comp: build & ci"
-      - "PR target: master & patch"
-      - "PR action: merge"
+      - "target: patch"
+      - "action: merge"
     # Disable version updates
     # This does not affect security updates
     open-pull-requests-limit: 0
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
index 8c154c9c03d4..c8e81beac98a 100644
--- a/.github/workflows/lock-closed.yml
+++ b/.github/workflows/lock-closed.yml
@@ -9,7 +9,6 @@ jobs:
   lock_closed:
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@414834b2b24dd2df37c6ed00808387ee6fd91b66
-
+      - uses: angular/dev-infra/github-actions/lock-closed@4f335a4c1f01f20bf905acee2d68c7248f50f2a0
         with:
           lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}
diff --git a/.gitignore b/.gitignore
index 80366783e51d..357df0969694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ yarn-error.log*
 .ng_pkg_build/
 .ng-dev.log
 .ng-dev.user*
+.husky/_
+.bazelrc.user
 
 # Mac OSX Finder files.
 **/.DS_Store
diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 000000000000..c9cdc63b0701
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
\ No newline at end of file
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 000000000000..1b07f649c828
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname $0)/_/husky.sh"
+
+yarn -s ng-dev commit-message pre-commit-validate --file $1;
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
new file mode 100755
index 000000000000..3a3afe6f32f5
--- /dev/null
+++ b/.husky/prepare-commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname $0)/_/husky.sh"
+
+yarn -s ng-dev commit-message restore-commit-message-draft $1 $2;
diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts
index 2e6bd184fdca..a5d99ef26f13 100644
--- a/.ng-dev/config.ts
+++ b/.ng-dev/config.ts
@@ -1,2 +1,3 @@
 export { commitMessage } from './commit-message';
 export { github } from './github';
+export { merge } from './merge';
diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
new file mode 100644
index 000000000000..eb41a469caad
--- /dev/null
+++ b/.ng-dev/merge.ts
@@ -0,0 +1,26 @@
+import { DevInfraMergeConfig } from '@angular/dev-infra-private/pr/merge/config';
+import { getDefaultTargetLabelConfiguration } from '@angular/dev-infra-private/pr/merge/defaults';
+import { github } from './github';
+import { release } from './release';
+
+/**
+ * Configuration for the merge tool in `ng-dev`. This sets up the labels which
+ * are respected by the merge script (e.g. the target labels).
+ */
+export const merge: DevInfraMergeConfig['merge'] = async api => {
+  return {
+    githubApiMerge: {
+      default: 'rebase',
+      labels: [
+        {pattern: 'squash commits', method: 'squash'},
+      ],
+    },
+    claSignedLabel: 'cla: yes',
+    mergeReadyLabel: /^action: merge(-assistance)?/,
+    caretakerNoteLabel: /(action: merge-assistance)/,
+    commitMessageFixupLabel: 'commit message fixup',
+    // We can pick any of the NPM packages as we are in a monorepo where all packages are
+    // published together with the same version and branching.
+    labels: await getDefaultTargetLabelConfiguration(api, github, release),
+  };
+};
diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
new file mode 100644
index 000000000000..175b763add66
--- /dev/null
+++ b/.ng-dev/release.ts
@@ -0,0 +1,11 @@
+import { ReleaseConfig } from '@angular/dev-infra-private/release/config';
+import { packages } from '../lib/packages';
+
+/** Configuration for the `ng-dev release` command. */
+export const release: ReleaseConfig = {
+  npmPackages: Object.keys(packages),
+  // TODO: Set up package building.
+  buildPackages: async () => [],
+  // TODO: Set up generating changelogs
+  generateReleaseNotesForHead: async () => {},
+};
diff --git a/.nvmrc b/.nvmrc
index 4e31022509a8..fd26bfb7c563 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.13
+10.18.1
diff --git a/.prettierignore b/.prettierignore
index fbcd212375a5..04975244c3e8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,9 @@
+/bazel-out/
+/dist-schema/
 /etc/api
+/tests/
+/README.md
+/CONTRIBUTING.md
+.yarn/
+dist/
+third_party/
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index 5e2863a11f68..8ef20e3c1ea0 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,6 @@
 {
   "printWidth": 100,
+  "quoteProps": "preserve",
   "singleQuote": true,
   "trailingComma": "all"
 }
diff --git a/.yarn/releases/yarn-1.22.5.js b/.yarn/releases/yarn-1.22.10.cjs
similarity index 99%
rename from .yarn/releases/yarn-1.22.5.js
rename to .yarn/releases/yarn-1.22.10.cjs
index d31be0b947fb..68b1990b1d92 100755
--- a/.yarn/releases/yarn-1.22.5.js
+++ b/.yarn/releases/yarn-1.22.10.cjs
@@ -46679,7 +46679,7 @@ function mkdirfix (name, opts, cb) {
 /* 194 */
 /***/ (function(module, exports) {
 
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.5","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.10","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
 /* 195 */
@@ -97014,7 +97014,7 @@ let run = exports.run = (() => {
       if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
         yield (_fs || _load_fs()).writeFile(lockfilePath, '');
       }
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion], {
+      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion, '--silent'], {
         stdio: 'inherit',
         cwd: config.cwd
       });
diff --git a/.yarnrc b/.yarnrc
index 0a159c3011f5..7fe6e33326b9 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -3,4 +3,4 @@
 
 
 lastUpdateCheck 1581546341989
-yarn-path ".yarn/releases/yarn-1.22.5.js"
+yarn-path ".yarn/releases/yarn-1.22.10.cjs"
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..8801fb68e07f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,43 @@
+<a name="11.2.19"></a>
+
+# 11.2.19 (2022-03-30)
+
+### @angular-devkit/architect-cli
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [75caa1143](https://github.com/angular/angular-cli/commit/75caa1143f4007c9550ab0dabb62ae4df91e3827) | fix  | update `minimist` to `1.2.6` |
+
+### @angular-devkit/schematics-cli
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [80d479e9f](https://github.com/angular/angular-cli/commit/80d479e9fdfcf6863ebbe0986ea6cd29309f398d) | fix  | update `minimist` to `1.2.6` |
+
+### @angular-devkit/benchmark
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [f61cd1a79](https://github.com/angular/angular-cli/commit/f61cd1a79b6960711d4aa5b16d04308bbdc67beb) | fix  | update `minimist` to `1.2.6` |
+
+## Special Thanks
+
+Alan Agius and Doug Parker
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="11.2.16"></a>
+
+# 11.2.16 (2021-12-15)
+
+### @angular/cli
+
+| Commit                                                                                              | Type | Description                                                                               |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------------------------------- |
+| [f456b0962](https://github.com/angular/angular-cli/commit/f456b0962b9f339759bc86c092256f68d68d9ecf) | fix  | error when updating Angular packages across multi-major migrations                        |
+| [886d2511e](https://github.com/angular/angular-cli/commit/886d2511e292b687acce1ac4c6924f992494d14f) | fix  | logic which determines which temp version of the CLI is to be download during `ng update` |
+| [776d1210a](https://github.com/angular/angular-cli/commit/776d1210a9e62bf2531d977138f49f93820a8b87) | fix  | update `ng update` output for Angular packages                                            |
+
+## Special Thanks
+
+Alan Agius and Doug Parker
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2e09483cc852..817aa82f543f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
     git rebase master -i
     git push -f
     ```
-  * Add the `PR action: merge` label and the correct
+  * Add the `action: merge` label and the correct
 [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
     (if PR author has the project collaborator status, or else the last reviewer
     should do this).
diff --git a/README.md b/README.md
index d8179b1d157c..af0d07aa24af 100644
--- a/README.md
+++ b/README.md
@@ -120,8 +120,7 @@ There are two different test suites which can be run locally:
   * Run a subset of the tests, use the full Bazel target example: `yarn bazel test //packages/schematics/angular:angular_test`
   * For a complete list of test targets use the following Bazel query: `yarn bazel query "tests(//packages/...)"`
 
-You can find more info about debugging [tests with Bazel in the docs.]
-(https://github.com/angular/angular-cli/blob/master/docs/process/bazel.md#debugging-jasmine_node_test)  
+You can find more info about debugging [tests with Bazel in the docs.](https://github.com/angular/angular-cli/blob/master/docs/process/bazel.md#debugging-jasmine_node_test)  
 
 ### End to end tests
   * Run: `node tests/legacy-cli/run_e2e.js`
diff --git a/WORKSPACE b/WORKSPACE
index ce17d81e74fd..2d301fdadf24 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -7,8 +7,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "64a71a64ac58b8969bb19b1c9258a973b6433913e958964da698943fb5521d98",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.1/rules_nodejs-2.2.1.tar.gz"],
+    sha256 = "bfacf15161d96a6a39510e7b3d3b522cf61cb8b82a31e79400a84c5abcab5347",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.1/rules_nodejs-3.2.1.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
@@ -24,7 +24,7 @@ Angular has a dependency on the @bazel/bazelisk package which supplies it.
 Try running `yarn bazel` instead.
     (If you did run that, check that you've got a fresh `yarn install`)
 """,
-    minimum_bazel_version = "3.0.0",
+    minimum_bazel_version = "4.0.0",
 )
 
 # The NodeJS rules version must be at least the following version because:
@@ -62,22 +62,19 @@ yarn_install(
         "//:tools/yarn/check-yarn.js",
     ],
     package_json = "//:package.json",
+    strict_visibility = False,  # Needed for ts-api-guardian. More info about this can be found https://github.com/bazelbuild/rules_nodejs/wiki#strict_visibility-on-yarn_install-and-npm_install-now-defaults-true-2199
     yarn_lock = "//:yarn.lock",
 )
 
-load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
-
-install_bazel_dependencies(suppress_warning = True)
-
 ##########################
 # Remote Execution Setup #
 ##########################
 # Bring in bazel_toolchains for RBE setup configuration.
 http_archive(
     name = "bazel_toolchains",
-    sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7",
-    strip_prefix = "bazel-toolchains-3.6.0",
-    url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.6.0.tar.gz",
+    sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
+    strip_prefix = "bazel-toolchains-4.0.0",
+    url = "https://github.com/bazelbuild/bazel-toolchains/archive/4.0.0.tar.gz",
 )
 
 load("@bazel_toolchains//rules:environments.bzl", "clang_env")
@@ -88,7 +85,7 @@ rbe_autoconfig(
     # Need to specify a base container digest in order to ensure that we can use the checked-in
     # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
     # need to pull the image and run it in order determine the toolchain configuration. See:
-    # https://github.com/bazelbuild/bazel-toolchains/blob/3.5.0/configs/ubuntu16_04_clang/versions.bzl
+    # https://github.com/bazelbuild/bazel-toolchains/blob/4.0.0/configs/ubuntu16_04_clang/versions.bzl
     base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
     # 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>
diff --git a/bin/architect b/bin/architect
index 7885feefe26a..f42625548dcc 100755
--- a/bin/architect
+++ b/bin/architect
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/bin/benchmark b/bin/benchmark
index 4ada663d8bfc..ab9e764db5d2 100755
--- a/bin/benchmark
+++ b/bin/benchmark
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/bin/build-optimizer b/bin/build-optimizer
index 6f540387043c..edb79fd823ad 100755
--- a/bin/build-optimizer
+++ b/bin/build-optimizer
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/bin/devkit-admin b/bin/devkit-admin
index 707a854a5b37..ddaf4aff0920 100755
--- a/bin/devkit-admin
+++ b/bin/devkit-admin
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/bin/ng b/bin/ng
index d43c5512e47b..d3a7c83116d5 100755
--- a/bin/ng
+++ b/bin/ng
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/bin/schematics b/bin/schematics
index ea3f5176befa..8c3eb81d46c9 100755
--- a/bin/schematics
+++ b/bin/schematics
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/docs/design/analytics.md b/docs/design/analytics.md
index abdc477910d1..1658f5d4b91a 100644
--- a/docs/design/analytics.md
+++ b/docs/design/analytics.md
@@ -48,16 +48,16 @@ Note: There's a limit of 20 custom dimensions.
 | 6 | `--collection` | `string` |
 | 7 | `Flag: --strict` | `boolean` |
 | 8 | `Ivy Enabled` | `boolean` |
-| 9 | `Flag: --inlineStyle` | `boolean` |
-| 10 | `Flag: --inlineTemplate` | `boolean` |
-| 11 | `Flag: --viewEncapsulation` | `string` |
-| 12 | `Flag: --skipTests` | `boolean` |
+| 9 | `Flag: --inline-style` | `boolean` |
+| 10 | `Flag: --inline-template` | `boolean` |
+| 11 | `Flag: --view-encapsulation` | `string` |
+| 12 | `Flag: --skip-tests` | `boolean` |
 | 13 | `Flag: --aot` | `boolean` |
 | 14 | `Flag: --minimal` | `boolean` |
-| 15 | `Flag: --lintFix` | `boolean` |
+| 15 | `Flag: --lint-fix` | `boolean` |
 | 16 | `Flag: --optimization` | `boolean` |
 | 17 | `Flag: --routing` | `boolean` |
-| 18 | `Flag: --skipImport` | `boolean` |
+| 18 | `Flag: --skip-import` | `boolean` |
 | 19 | `Flag: --export` | `boolean` |
 | 20 | `Build Errors (comma separated)` | `string` |
 <!--DIMENSIONS_TABLE_END-->
diff --git a/docs/design/build-system-overview.dot b/docs/design/build-system-overview.dot
index bdd50d1e1db6..a337d917364e 100644
--- a/docs/design/build-system-overview.dot
+++ b/docs/design/build-system-overview.dot
@@ -9,7 +9,7 @@ digraph G {
   "*.scss\|sass" -> "sass-loader" -> "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer";
   "*.less" -> "less-loader" -> "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer";
   "*.styl" -> "stylus-loader" -> "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer";
-  "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer" -> "raw-loader" [label="component style?"] -> "./optimize-css-webpack-plugin.ts";
+  "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer" -> "raw-loader, ./optimize-css-webpack-plugin.ts"  [label="component style?"];
   "raw-loader" -> "./optimize-css-webpack-plugin.ts"
   "postcss-loader with postcss-import, ./postcss-cli-resources.ts, autoprefixer" -> "style-loader, ./raw-css-loader.ts, and mini-css-extract-plugin" [label="global style?"];
   "style-loader, ./raw-css-loader.ts, and mini-css-extract-plugin" -> "./optimize-css-webpack-plugin.ts"
diff --git a/docs/process/release.md b/docs/process/release.md
index 96d3fde42fae..9863d6b8a39e 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -22,61 +22,18 @@ Alan    | Doug
 Charles | Keen
 Filipe  | Minko
 
-## Triaging Issues
-TBD
-
 ## Merging PRs
 
 The list of PRs which are currently ready to merge (approved with passing status checks) can
 be found with [this search](https://github.com/angular/angular-cli/pulls?q=is%3Apr+is%3Aopen+label%3A%22PR+action%3A+merge%22+-is%3Adraft).
-This list should be checked daily and any ready PRs should be merged. For each
-PR, check the `PR target` label to understand where it should be merged to. If
-`master` is targetted, then click "Rebase and Merge". If the PR also targets a
-patch branch, see [Maintaining Patch Branches](#maintaining-patch-branches).
-Whatever the target, rebasing should be used over merging to avoid cluttering
-the Git history with merge commits.
-
-### Maintaining Patch Branches
-
-When a PR is merged, if the `PR target` label includes a branch other than
-`master`, commits will need to be cherry-picked to an associated branch. In
-particular, the `patch` target simply refers to the latest patch branch (eg.
-`1.2.x` or `1.3.x-rc.0`). This branch should be updated by cherry-picking all
-commits from the PR to it.
-
-Cherry picking is done by checking out the patch branch and cherry picking the new commit onto it.
-The patch branch is simply named as a version number, with a X in the relevant spot, such as `9.0.x`.
-This should be done after merging to master.
-
-```shell
-# Make sure commit to upstream/master is present in local repo.
-git fetch upstream master
-
-# Check out patch branch from upstream.
-git fetch upstream <patch branch>
-git checkout <patch branch>
-
-# Cherry pick the commit. Use the hash from the commit which was merged
-# into upstream/master, which should be known to your local repo.
-git cherry-pick -x <commit hash from master>
-# If you have multiple cherry picks, you can do them all here.
-
-# Resolve merge conflicts if necessary...
-# Or abort and ask author to submit a separate commit targeting patch-only.
-
-# Push changes.
-git push upstream <patch branch>
-```
-
-If you get a `bad revision` error when cherry picking, make sure you are using
-the commit hash used when merged into `master`, _not_ the hash listed in the PR.
-Also verify that you have fetched `master` from `upstream` since that commit was
-merged.
+This list should be checked daily and any ready PRs should be merged. For each PR, check the
+`target` label to understand where it should be merged to.  You can find which branches a specific
+PR will be merged into with the `yarn ng-dev pr check-target-branches <pr>` command.
 
-If the commit is not merged to `master` (because it targets `patch only` for
-instance), then you will need to fetch the contributor's branch for your local
-Git instance to have knowledge of the commit being cherry picked onto the patch
-branch.
+When ready to merge a PR, run the following command:
+```
+yarn ng-dev pr merge <pr>
+```
 
 ### Maintaining LTS branches
 
@@ -96,27 +53,24 @@ In general, cherry picks for LTS should only be done if it meets one of the crit
 
 ## Before releasing
 
-Make sure the CI is green.
-
-Consider if you need to update [`packages/schematics/angular/utility/latest-versions.ts`](https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/latest-versions.ts) to reflect changes in dependent versions.
+Update `Angular` version in [`packages/schematics/angular/utility/latest-versions.ts`](https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/latest-versions.ts).
 
 ## Shepparding
 
 As commits are cherry-picked when PRs are merged, creating the release should be a matter of creating a tag.
 
-**Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`.**
-
 ```bash
-git commit -a -m 'release: vXX'
+git add packages/schematics/angular/utility/latest-versions.ts
+git commit -m 'release: vXX'
 git tag -a 'vXX' -m 'release: tag vXX'
 ```
 
-The package versions we are about to publish are derived from the git tag that
-we just created. Double check that the versions are correct by running the
+The package versions we are about to publish are derived from `version` in the root
+[`package.json`](https://github.com/angular/angular-cli/blob/master/package.json#L3). Double check that the versions are correct by running the
 following command.
 
 ```bash
-yarn admin packages --version
+yarn admin packages --releaseCheck
 ```
 
 Now push the commit and the tag to the upstream repository. **Make sure to use
@@ -131,7 +85,7 @@ git push upstream --follow-tags
 **This can ONLY be done by a Google employee.**
 
 Log in to the Wombat publishing service using your own github and google.com
-account to publish.  This enforces the loging is done using 2Factor auth.
+account to publish.  This enforces the login is done using 2Factor auth.
 
 Run `npm login --registry https://wombat-dressing-room.appspot.com`:
 
@@ -147,20 +101,20 @@ After closing the tab, you have successfully logged in, it is time to publish.
 
 **This can ONLY be done by a Google employee.**
 
-**It is a good idea to wait for CI to be green on the patch branch and tag before doing the release.**
+**Wait for CI to be green after pushing the release commit.**
 
 For the first release of a major version, follow the instructions in
 [Publishing a Major Version](#publishing-a-major-version) section.
 
 For non-major release, check out the patch branch (e.g. `9.1.x`), then run:
 ```bash
-yarn # Reload dependencies
+rm -rf node_modules/ && yarn # Reload dependencies
 yarn admin publish --tag latest
 ```
 
 If also publishing a prerelease, check out `master`, then run:
 ```bash
-yarn # Reload dependencies
+rm -rf node_modules/ && yarn # Reload dependencies
 yarn admin publish --tag next
 ```
 
@@ -170,7 +124,7 @@ run:
 **Make sure to update the NPM tag for the version you are releasing!**
 
 ```bash
-yarn # Reload dependencies
+rm -rf node_modules/ && yarn # Reload dependencies
 yarn admin publish --tag v8-lts
 ```
 
@@ -195,30 +149,25 @@ using the `--githubToken` flag. You just then have to confirm the draft.
 
 > **Tags containing `next` or `rc` should be marked as pre-release.**
 
-### Microsite Publishing
-
-The [microsite](https://cli.angular.io/) is the landing page for Angular CLI and
-is a one-page static page.
+## Post-release Version Update
 
-> **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.**
+**For each released version**:
 
-Check out if changes were made to the microsite:
+Update the package versions to reflect the *next* release version in **both**:
+1. `version` in [`package.json`](https://github.com/angular/angular-cli/blob/master/package.json#L3)
+1. `DevkitBuild*` in [`packages/schematics/angular/utility/latest-versions.ts`](https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/latest-versions.ts)
 
 ```sh
-git log v8.0.0-beta.0..HEAD --oneline etc/cli.angular.io | wc -l
+git checkout -b release-bump-vXX
+git commit package.json packages/schematics/angular/utility/latest-versions.ts -m "build: bump version to vXX"
+git push -u origin release-bump-vXX
 ```
 
-If the number is 0 you can ignore the rest of this section.
-
-To publish, go to the
-[`angular-cli/etc/cli.angular.io`](https://github.com/angular/angular-cli/tree/master/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).
+Then make a PR and assign it to the next primary caretaker.
 
-This is detailed in [`etc/cli.angular.io/README.md`](https://github.com/angular/angular-cli/blob/master/etc/cli.angular.io/README.md).
+Don't forget to update the Slack [#tools](https://angular-team.slack.com/archives/C46U16D4Z) channel topic and also post
+links to all the version bump PRs. If anyone else on the team notices these links missing, they should ask the caretaker
+to make sure the post-release version bump is not forgotten.
 
 ## Publishing a Major Version
 
diff --git a/etc/api/BUILD.bazel b/etc/api/BUILD.bazel
index 1818047e8a0c..1d70fb1c9a14 100644
--- a/etc/api/BUILD.bazel
+++ b/etc/api/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_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/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 93168b67c547..0572bee4faef 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -715,6 +715,7 @@ export interface PromptDefinition {
     }>;
     message: string;
     multiselect?: boolean;
+    propertyTypes: Set<string>;
     raw?: string | JsonObject;
     type: string;
     validator?: (value: JsonValue) => boolean | string | Promise<boolean | string>;
diff --git a/etc/api/angular_devkit/schematics/tasks/index.d.ts b/etc/api/angular_devkit/schematics/tasks/index.d.ts
index 3dc96f5b9e23..1ce44e1880fd 100644
--- a/etc/api/angular_devkit/schematics/tasks/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tasks/index.d.ts
@@ -4,7 +4,7 @@ export declare class NodePackageInstallTask implements TaskConfigurationGenerato
     packageName?: string;
     quiet: boolean;
     workingDirectory?: string;
-    constructor(options: Partial<NodePackageInstallTaskOptions>);
+    constructor(options: NodePackageInstallTaskOptions);
     constructor(workingDirectory?: string);
     toConfiguration(): TaskConfiguration<NodePackageTaskOptions>;
 }
diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
index 6e8d48b9812f..3573352ab41e 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -134,7 +134,9 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
 
 export interface NodeWorkflowOptions {
     dryRun?: boolean;
+    engineHostCreator?: (options: NodeWorkflowOptions) => NodeModulesEngineHost;
     force?: boolean;
+    optionTransforms?: OptionTransform<object, object>[];
     packageManager?: string;
     packageRegistry?: string;
     registry?: schema.CoreSchemaRegistry;
diff --git a/etc/cli.angular.io/.firebaserc b/etc/cli.angular.io/.firebaserc
deleted file mode 100644
index 3f1a5bf73284..000000000000
--- a/etc/cli.angular.io/.firebaserc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "projects": {
-    "default": "cli-angular-io"
-  }
-}
diff --git a/etc/cli.angular.io/README.md b/etc/cli.angular.io/README.md
deleted file mode 100644
index 5e0190d83dc3..000000000000
--- a/etc/cli.angular.io/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Angular CLI microsite
-
-This folder contains all the static files used for the Angular CLI microsite
-(http://cli.angular.io).
-
-To make changes on the frontend, just update the files here, and ask the
-caretaker to deploy the new site when the commit is merged. Your commit should
-be of scope `docs:` (**NOT** `fix` or `feat`).
-
-## Deploy
-
-To deploy, use your firebase credentials to login, then use `firebase deploy`
-from this folder. There is currently no build step.
diff --git a/etc/cli.angular.io/angular-logo-with-text.svg b/etc/cli.angular.io/angular-logo-with-text.svg
deleted file mode 100644
index 51b8487acc9a..000000000000
--- a/etc/cli.angular.io/angular-logo-with-text.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg class="site-logo" width="125px" viewBox="0 0 506 150" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Angular Logo">
-            <g transform="translate(7.000000, 5.000000)">
-                <path d="M63.5346,0.0002 L-0.0004,22.6812 L9.6596,106.8882 L63.5346,136.7842 L118.3786,106.4852 L128.8876,22.2792 L63.5346,0.0002 Z M63.5346,15.2512 L105.1226,103.7832 L91.3386,103.7832 L82.5836,83.7842 L63.5346,83.7842 L46.8446,83.7842 L38.8496,103.7362 L23.8346,103.9872 L63.5346,15.2512 Z" id="Fill-1" fill="#FFFFFF"></path>
-                <polygon id="Fill-2" fill="#FFFFFF" points="52.0919 71.784 63.5339 71.784 77.4439 71.784 63.5339 43.696"></polygon>
-                <path d="M63.5346,0.0002 L-0.0004,22.6812 L9.6596,106.8882 L63.5346,136.7842 L118.3786,106.4852 L128.8876,22.2792 L63.5346,0.0002 Z M63.5346,15.2512 L105.1226,103.7832 L91.3386,103.7832 L82.5836,83.7842 L63.5346,83.7842 L46.8446,83.7842 L38.8496,103.7362 L23.8346,103.9872 L63.5346,15.2512 Z" id="Fill-3" fill="#FFFFFF"></path>
-                <polygon id="Fill-4" fill="#FFFFFF" points="52.0919 71.784 63.5339 71.784 77.4439 71.784 63.5339 43.696"></polygon>
-                <polygon id="Fill-5" fill="#F2F2F2" points="63.5342 43.6959 63.5342 71.7839 77.4442 71.7839"></polygon>
-                <polygon id="Fill-6" fill="#F2F2F2" points="63.5346 0.0002 63.5346 15.2512 105.1226 103.7832 91.3386 103.7832 82.5836 83.7842 63.5346 83.7842 63.5346 136.7842 118.3786 106.4852 128.8876 22.2792"></polygon>
-                <polygon id="Fill-7" fill="#FFFFFF" points="52.0919 71.784 63.5339 71.784 63.5339 43.696"></polygon>
-                <polygon id="Fill-8" fill="#FFFFFF" points="63.5346 0.0002 -0.0004 22.6812 9.6596 106.8882 63.5346 136.7842 63.5346 83.7842 46.8446 83.7842 38.8496 103.7362 23.8346 103.9872 63.5346 15.2512"></polygon>
-                <g id="Group-21" transform="translate(151.000000, 41.784000)">
-                    <path id="Fill-9" fill="#CBCBCB"></path>
-                    <path id="Fill-11" fill="#FFFFFF"></path>
-                    <path id="Fill-13" fill="#FFFFFF"></path>
-                    <path id="Fill-15" fill="#FFFFFF"></path>
-                    <path id="Fill-17" fill="#FFFFFF"></path>
-                    <path id="Fill-19" fill="#FFFFFF"></path>
-                </g>
-                <polygon id="Fill-22" fill="#FFFFFF" points="147.6777 101.3206 147.6777 39.7866 155.6367 39.7866 193.2887 89.3556 193.2887 39.7866 200.8197 39.7866 200.8197 101.3206 192.8607 101.3206 155.2057 51.3156 155.2057 101.3206"></polygon>
-                <g id="Group-33" transform="translate(212.000000, 30.784000)" fill="#FFFFFF">
-                    <path d="M49.9213,68.1254 C44.9603,70.0214 39.6103,70.9664 33.8713,70.9664 C11.5843,70.9664 0.4373,60.2814 0.4373,38.9074 C0.4373,18.6834 11.1953,8.5694 32.7113,8.5694 C38.8783,8.5694 44.6173,9.4324 49.9213,11.1554 L49.9213,18.0394 C44.6173,16.0314 39.1633,15.0264 33.5703,15.0264 C16.7923,15.0264 8.4003,22.9884 8.4003,38.9074 C8.4003,55.9754 16.6613,64.5144 33.1853,64.5144 C35.8213,64.5144 38.7513,64.1704 41.9653,63.4774 L41.9653,42.5654 L49.9213,42.5654 L49.9213,68.1254 Z" id="Fill-23"></path>
-                    <path d="M62.6159,46.7822 L62.6159,9.0002 L70.5719,9.0002 L70.5719,46.7822 C70.5719,58.6002 76.4529,64.5122 88.2169,64.5122 C99.9769,64.5122 105.8599,58.6002 105.8599,46.7822 L105.8599,9.0002 L113.8199,9.0002 L113.8199,46.7822 C113.8199,62.9092 105.2849,70.9652 88.2169,70.9652 C71.1499,70.9652 62.6159,62.9092 62.6159,46.7822" id="Fill-25"></path>
-                    <polygon id="Fill-27" points="135.9801 8.9995 135.9801 64.0805 168.1691 64.0805 168.1691 70.5335 128.0241 70.5335 128.0241 8.9995"></polygon>
-                    <polygon id="Fill-29" points="179.6577 70.5357 171.3977 70.5357 201.9917 0.8807 232.5827 70.5357 223.7617 70.5357 215.8017 51.1697 195.4497 51.1697 197.6457 44.7177 213.1337 44.7177 201.6467 16.8307"></polygon>
-                    <path d="M240.9755,70.5366 L240.9755,9.0026 L267.2255,9.0026 C278.9305,9.0026 284.7785,13.9216 284.7785,23.7616 C284.7785,31.7636 279.0615,37.6926 267.6135,41.5316 L288.7405,70.5366 L278.2365,70.5366 L258.6635,42.8686 L258.6635,37.6616 C270.4235,35.7916 276.3065,31.2786 276.3065,24.1046 C276.3065,18.4276 273.0335,15.5866 266.4915,15.5866 L248.9345,15.5866 L248.9345,70.5366 L240.9755,70.5366 Z" id="Fill-31"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/etc/cli.angular.io/angular-logo.svg b/etc/cli.angular.io/angular-logo.svg
deleted file mode 100644
index fc8b6e94fc32..000000000000
--- a/etc/cli.angular.io/angular-logo.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="50px" height="60px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 250 250" style="enable-background:new 0 0 250 250;" xml:space="preserve">
-  <style type="text/css">
-    .st0{fill:#FFFFFF;}
-    .st1{opacity:0.9;}
-  </style>
-  <g>
-    <g>
-      <polygon class="st0" points="125,153.4 100.3,153.4 88.6,182.6 88.6,182.6 66.9,182.6 66.8,182.6 125,52.1 125,52.2 125,52.2
-        125,30 125,30 31.9,63.2 46.1,186.3 125,230 125,230 125,153.4 		"/>
-      <polygon class="st0" points="108,135.4 125,135.4 125,135.4 125,94.5 		"/>
-    </g>
-    <g class="st1">
-      <polygon class="st0" points="125,153.4 149.7,153.4 161.4,182.6 161.4,182.6 183.1,182.6 183.2,182.6 125,52.1 125,52.2 125,52.2
-        125,30 125,30 218.1,63.2 203.9,186.3 125,230 125,230 125,153.4 		"/>
-      <polygon class="st0" points="142,135.4 125,135.4 125,135.4 125,94.5 		"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/etc/cli.angular.io/favicon.ico b/etc/cli.angular.io/favicon.ico
deleted file mode 100644
index 4dace951fab2..000000000000
Binary files a/etc/cli.angular.io/favicon.ico and /dev/null differ
diff --git a/etc/cli.angular.io/firebase.json b/etc/cli.angular.io/firebase.json
deleted file mode 100644
index b55622a85956..000000000000
--- a/etc/cli.angular.io/firebase.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "hosting": {
-    "public": "",
-    "ignore": [
-      "firebase.json",
-      "README.md",
-      "**/.*"
-    ],
-    "rewrites": [
-      {
-        "source": "/**/!(*.@(js|ts|html|css|json|svg|png|jpg|jpeg))",
-        "destination": "/index.html"
-      }
-    ]
-  }
-}
diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
deleted file mode 100644
index 71f55c419027..000000000000
--- a/etc/cli.angular.io/index.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!doctype html>
-<html lang="">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="favicon.ico" rel="shortcut icon" type="image/ico">
-    <title>Angular CLI</title>
-
-    <!-- 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">
-</head>
-<body class="mdl-demo mdl-base">
-<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
-
-    <div class="mdl-demo mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header">
-  <header class="mdl-layout__header">
-    <div class="mdl-layout__header-row">
-      <span class="mdl-layout-title">
-        <a class="site-header mdl-navigation__link--title" href="/">
-          <img src="angular-logo-with-text.svg" alt="">
-          <span class="microsite-name mdl-typography--font-light">CLI</span>
-        </a>
-      </span>
-    <input type="checkbox" id="site-nav-checkbox" class="visuallyhidden">
-    <div class="top-nav-wrapper">
-        <label for="site-nav-checkbox">SITE MENU</label>
-        <nav class="mdl-navigation">
-
-            <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>
-
-        </nav>
-        <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://angular.io/cli"> Get Started </a>
-        </nav>
-    </div>
-    </div>
-  </header>
-
-
-    <main class="mdl-layout__content">
-      <header class="hero-background">
-
-          <!-- Hero -->
-          <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">
-            <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>
-            <h5 class="tagline">A command line interface for Angular</h5>
-            <a href="https://angular.io/cli" class="mdl-typography--font-regular cta mdl-button mdl-button--raised mdl-button--primary">
-                Get Started
-            </a>
-        </div>
-    </section>
-</header>
-
-
-      </header>
-
-      <!-- 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</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>
-
-
-    <div class="button-container mdl-cell mdl-cell--12-col-desktop center">
-        <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>
-</section>
-
-
-      <footer>
-    <div class="mdl-mega-footer--bottom-section">
-        <div class="mdl-grid">
-            <div class="mdl-cell mdl-cell--1-col mdl-cell--12-col-tablet mdl-typography--text-center">
-                <img src="angular-logo.svg" alt="">
-            </div>
-            <div class="mdl-cell mdl-cell--2-col mdl-cell--12-col-tablet footer-links">
-                <ul class="footer-links">
-                    <li> <a class="" href="https://www.angular.io">Learn Angular</a> </li>
-                </ul>
-            </div>
-            <div class="mdl-cell mdl-cell--9-col">
-                <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>
-</footer>
-
-    </main>
-  </div></div>
-
-<script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-8594346-15', 'auto');
-    ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/etc/cli.angular.io/license.html b/etc/cli.angular.io/license.html
deleted file mode 100644
index 0131cc303c40..000000000000
--- a/etc/cli.angular.io/license.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<pre style="word-wrap: break-word; white-space: pre-wrap;">The MIT License
-
-Copyright (c) Google, Inc. All Rights Reserved.
-
-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.
-</pre>
-
diff --git a/etc/cli.angular.io/main.css b/etc/cli.angular.io/main.css
deleted file mode 100644
index 61b0cb066543..000000000000
--- a/etc/cli.angular.io/main.css
+++ /dev/null
@@ -1 +0,0 @@
-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/material.min.css b/etc/cli.angular.io/material.min.css
deleted file mode 100644
index e750f8137205..000000000000
--- a/etc/cli.angular.io/material.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * material-design-lite - Material Design Components in CSS, JS and HTML
- * @version v1.1.3
- * @license Apache-2.0
- * @copyright 2015 Google, Inc.
- * @link https://github.com/google/material-design-lite
- */
-@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter{background:transparent!important;color:#000!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%;margin:0}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:#ff4081;font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.material-icons{font-family:'Material Icons';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:#3f51b5 !important}.mdl-color--primary-contrast{background-color:#fff !important}.mdl-color--primary-dark{background-color:#303f9f !important}.mdl-color--accent{background-color:#ff4081 !important}.mdl-color--accent-contrast{background-color:#fff !important}.mdl-color-text--primary{color:#3f51b5 !important}.mdl-color-text--primary-contrast{color:#fff !important}.mdl-color-text--primary-dark{color:#303f9f !important}.mdl-color-text--accent{color:#ff4081 !important}.mdl-color-text--accent-contrast{color:#fff !important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1),-webkit-transform .3s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:#ff4081;color:#fff}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:#ff4081;background:rgba(255,255,255,.2);box-shadow:0 0 1px gray}.mdl-badge.mdl-badge--overlap{margin-right:10px}.mdl-badge.mdl-badge--overlap:after{right:-10px}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;margin:0;min-width:64px;padding:0 16px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow;transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:#3f51b5}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:#3f51b5;color:#fff}.mdl-button--raised.mdl-button--colored:hover{background-color:#3f51b5}.mdl-button--raised.mdl-button--colored:active{background-color:#3f51b5}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:#3f51b5}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:#fff}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:#ff4081;color:#fff}.mdl-button--fab.mdl-button--colored:hover{background-color:#ff4081}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:#ff4081}.mdl-button--fab.mdl-button--colored:active{background-color:#ff4081}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:#fff}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:#3f51b5}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:#fff}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:#fff;background-color:#3f51b5}.mdl-button--accent.mdl-button--accent{color:#ff4081}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:#fff}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:#fff;background-color:#ff4081}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:default;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:none}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:#ff4081;background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:rgba(0,0,0,.54);margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:1rem;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid #3f51b5}fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline,.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(63,81,181,.26);background-color:rgba(63,81,181,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:#3f51b5 url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}fieldset[disabled] .mdl-checkbox.is-checked .mdl-checkbox__tick-outline,.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}fieldset[disabled] .mdl-checkbox .mdl-checkbox__label,.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:#3f51b5}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container .mdl-ripple,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px 12px 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px;box-sizing:border-box}.mdl-data-table td,.mdl-data-table td .mdl-data-table__select{vertical-align:middle}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th.mdl-data-table__header--sorted-ascending,.mdl-data-table th.mdl-data-table__header--sorted-descending{color:rgba(0,0,0,.87)}.mdl-data-table th.mdl-data-table__header--sorted-ascending:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:before{font-family:'Material Icons';font-weight:400;font-style:normal;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;font-size:16px;content:"\e5d8";margin-right:5px;vertical-align:sub}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover{cursor:pointer}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover:before{color:rgba(0,0,0,.26)}.mdl-data-table th.mdl-data-table__header--sorted-descending:before{content:"\e5db"}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-dialog{border:none;box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2);width:280px}.mdl-dialog__title{padding:24px 24px 0;margin:0;font-size:2.5rem}.mdl-dialog__actions{padding:8px 8px 8px 24px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row-reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.mdl-dialog__actions>*{margin-right:8px;height:36px}.mdl-dialog__actions>*:first-child{margin-right:0}.mdl-dialog__actions--full-width{padding:0 0 8px}.mdl-dialog__actions--full-width>*{height:48px;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;padding-right:16px;margin-right:0;text-align:right}.mdl-dialog__content{padding:20px 24px 24px;color:rgba(0,0,0,.54)}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list{display:none}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{content:''}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list{display:block}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:#3f51b5}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(63,81,181,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-list{display:block;padding:8px 0;list-style:none}.mdl-list__item{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;letter-spacing:.04em;line-height:1;min-height:48px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;padding:16px;cursor:default;color:rgba(0,0,0,.87);overflow:hidden}.mdl-list__item,.mdl-list__item .mdl-list__item-primary-content{box-sizing:border-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.mdl-list__item .mdl-list__item-primary-content{-webkit-order:0;-ms-flex-order:0;order:0;-webkit-flex-grow:2;-ms-flex-positive:2;flex-grow:2;text-decoration:none}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-icon{margin-right:32px}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-avatar{margin-right:16px}.mdl-list__item .mdl-list__item-secondary-content{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-left:16px}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-action label{display:inline}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-info{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;color:rgba(0,0,0,.54)}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-sub-header{padding:0 0 0 16px}.mdl-list__item-icon,.mdl-list__item-icon.material-icons{height:24px;width:24px;font-size:24px;box-sizing:border-box;color:#757575}.mdl-list__item-avatar,.mdl-list__item-avatar.material-icons{height:40px;width:40px;box-sizing:border-box;border-radius:50%;background-color:#757575;font-size:40px;color:#fff}.mdl-list__item--two-line{height:72px}.mdl-list__item--two-line .mdl-list__item-primary-content{height:36px;line-height:20px;display:block}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-avatar{float:left}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left;margin-top:6px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-secondary-content{height:36px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-sub-title{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-list__item--three-line{height:88px}.mdl-list__item--three-line .mdl-list__item-primary-content{height:52px;line-height:20px;display:block}.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-avatar,.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left}.mdl-list__item--three-line .mdl-list__item-secondary-content{height:52px}.mdl-list__item--three-line .mdl-list__item-text-body{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;height:52px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1),-webkit-transform .3s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item--full-bleed-divider{border-bottom:1px solid rgba(0,0,0,.12)}.mdl-menu__item[disabled],.mdl-menu__item[data-mdl-disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover,.mdl-menu__item[data-mdl-disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus,.mdl-menu__item[data-mdl-disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple,.mdl-menu__item[data-mdl-disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px;max-width:100%}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:#3f51b5;z-index:1;left:0}.mdl-progress>.bufferbar{background-image:linear-gradient(to right,rgba(255,255,255,.7),rgba(255,255,255,.7)),linear-gradient(to right,#3f51b5 ,#3f51b5);z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress--indeterminate):not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(255,255,255,.7),rgba(255,255,255,.7)),linear-gradient(to right,#3f51b5 ,#3f51b5);-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(255,255,255,.9),rgba(255,255,255,.9)),linear-gradient(to right,#3f51b5 ,#3f51b5)}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:#3f51b5;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;margin:0;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0;opacity:.87}.mdl-navigation__link .material-icons{vertical-align:middle}.mdl-layout{width:100%;height:100%;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout__title,.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer.is-visible~.mdl-layout__content.mdl-layout__content{overflow:hidden}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:stretch;-ms-flex-align:stretch;-ms-grid-row-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#000;color:#e0e0e0}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:50px;font-family:Helvetica,Arial,sans-serif;margin:10px 12px;top:0;left:0;color:#fff;z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:#fff;background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer-button,.mdl-layout--no-desktop-drawer-button .mdl-layout__drawer-button{display:none}}.mdl-layout--no-drawer-button .mdl-layout__drawer-button{display:none}.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:#3f51b5;color:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header--waterfall.mdl-layout__header--waterfall-hide-top{-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.mdl-layout__header-row{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:40px}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__header-row{padding-left:40px}}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:16px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:#fff;line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;transition-property:background-color;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__obfuscator.is-visible{background-color:rgba(0,0,0,.5);visibility:visible}@supports (pointer-events:auto){.mdl-layout__obfuscator{background-color:rgba(0,0,0,.5);opacity:0;transition-property:opacity;visibility:visible;pointer-events:none}.mdl-layout__obfuscator.is-visible{pointer-events:auto;opacity:1}}.mdl-layout__content{-ms-flex:0 1 auto;position:relative;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:#3f51b5;overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{width:calc(100% - 8px);padding-left:4px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:#3f51b5;color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button{width:16px}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button .material-icons,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button .material-icons{position:relative;left:-4px}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{display:none;width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:#fff}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(255,255,255,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:#fff}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#ff4081;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:#fff}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;box-sizing:border-box;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid #3f51b5}.mdl-radio__outer-circle fieldset[disabled] .mdl-radio,.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transform:scale3d(0,0,0);transform:scale3d(0,0,0);border-radius:50%;background:#3f51b5}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}fieldset[disabled] .mdl-radio .mdl-radio__inner-circle,.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}fieldset[disabled] .mdl-radio .mdl-radio__label,.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:#3f51b5}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container,.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container .mdl-ripple,.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:#3f51b5;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,#3f51b5 16px,#3f51b5 0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:#3f51b5;border:none;transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:#3f51b5;border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(63,81,181,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(63,81,181,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:#3f51b5;-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:#3f51b5;transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:#3f51b5;transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,#3f51b5 0%,#3f51b5 37.5%,rgba(63,81,181,.26)37.5%,rgba(63,81,181,.26)100%);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:#3f51b5;transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:#3f51b5}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-snackbar{position:fixed;bottom:0;left:50%;cursor:default;background-color:#323232;z-index:3;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;font-family:"Roboto","Helvetica","Arial",sans-serif;will-change:transform;-webkit-transform:translate(0,80px);transform:translate(0,80px);transition:transform .25s cubic-bezier(.4,0,1,1);transition:transform .25s cubic-bezier(.4,0,1,1),-webkit-transform .25s cubic-bezier(.4,0,1,1);pointer-events:none}@media (max-width:479px){.mdl-snackbar{width:100%;left:0;min-height:48px;max-height:80px}}@media (min-width:480px){.mdl-snackbar{min-width:288px;max-width:568px;border-radius:2px;-webkit-transform:translate(-50%,80px);transform:translate(-50%,80px)}}.mdl-snackbar--active{-webkit-transform:translate(0,0);transform:translate(0,0);pointer-events:auto;transition:transform .25s cubic-bezier(0,0,.2,1);transition:transform .25s cubic-bezier(0,0,.2,1),-webkit-transform .25s cubic-bezier(0,0,.2,1)}@media (min-width:480px){.mdl-snackbar--active{-webkit-transform:translate(-50%,0);transform:translate(-50%,0)}}.mdl-snackbar__text{padding:14px 12px 14px 24px;vertical-align:middle;color:#fff;float:left}.mdl-snackbar__action{background:0 0;border:none;color:#ff4081;float:right;padding:14px 24px 14px 12px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;line-height:1;letter-spacing:0;overflow:hidden;outline:none;opacity:0;pointer-events:none;cursor:pointer;text-decoration:none;text-align:center;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-snackbar__action::-moz-focus-inner{border:0}.mdl-snackbar__action:not([aria-hidden]){opacity:1;pointer-events:auto}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(63,81,181,.5)}.mdl-switch__track fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:#3f51b5;left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch__thumb fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(63,81,181,.26);background-color:rgba(63,81,181,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch__label fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);transition-duration:.4s;transition-timing-function:step-end;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:#3f51b5}.mdl-switch__ripple-container fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}fieldset[disabled] .mdl-switch .mdl-switch__ripple-container .mdl-ripple,.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#3f51b5;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:#3f51b5}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;font-family:"Helvetica","Arial",sans-serif;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield__input[type="number"]{-moz-appearance:textfield}.mdl-textfield__input[type="number"]::-webkit-inner-spin-button,.mdl-textfield__input[type="number"]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#d50000;box-shadow:none}fieldset[disabled] .mdl-textfield .mdl-textfield__input,.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label,.mdl-textfield.has-placeholder .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{transition:none}fieldset[disabled] .mdl-textfield .mdl-textfield__label,.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{color:#3f51b5;font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#d50000;font-size:12px}.mdl-textfield__label:after{background-color:#3f51b5;bottom:20px;content:'';height:2px;left:45%;position:absolute;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#d50000}.mdl-textfield__error{color:#d50000;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{display:inline-block;position:relative;margin-left:32px;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;transform-origin:top center;will-change:transform;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-shadow--24dp{box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}.mdl-cell--order-1{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12{-webkit-order:12;-ms-flex-order:12;order:12}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--order-1-phone.mdl-cell--order-1-phone{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-phone.mdl-cell--order-2-phone{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-phone.mdl-cell--order-3-phone{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-phone.mdl-cell--order-4-phone{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-phone.mdl-cell--order-5-phone{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-phone.mdl-cell--order-6-phone{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-phone.mdl-cell--order-7-phone{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-phone.mdl-cell--order-8-phone{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-phone.mdl-cell--order-9-phone{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-phone.mdl-cell--order-10-phone{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-phone.mdl-cell--order-11-phone{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-phone.mdl-cell--order-12-phone{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:25%}.mdl-cell--2-offset,.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:50%}.mdl-cell--3-offset,.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:75%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--order-1-tablet.mdl-cell--order-1-tablet{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-tablet.mdl-cell--order-2-tablet{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-tablet.mdl-cell--order-3-tablet{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-tablet.mdl-cell--order-4-tablet{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-tablet.mdl-cell--order-5-tablet{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-tablet.mdl-cell--order-6-tablet{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-tablet.mdl-cell--order-7-tablet{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-tablet.mdl-cell--order-8-tablet{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-tablet.mdl-cell--order-9-tablet{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-tablet.mdl-cell--order-10-tablet{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-tablet.mdl-cell--order-11-tablet{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-tablet.mdl-cell--order-12-tablet{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:calc(12.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:12.5%}.mdl-cell--2-offset,.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:25%}.mdl-cell--3-offset,.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:calc(37.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:37.5%}.mdl-cell--4-offset,.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:50%}.mdl-cell--5-offset,.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:calc(62.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:62.5%}.mdl-cell--6-offset,.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:75%}.mdl-cell--7-offset,.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:calc(87.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:87.5%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--order-1-desktop.mdl-cell--order-1-desktop{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-desktop.mdl-cell--order-2-desktop{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-desktop.mdl-cell--order-3-desktop{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-desktop.mdl-cell--order-4-desktop{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-desktop.mdl-cell--order-5-desktop{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-desktop.mdl-cell--order-6-desktop{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-desktop.mdl-cell--order-7-desktop{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-desktop.mdl-cell--order-8-desktop{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-desktop.mdl-cell--order-9-desktop{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-desktop.mdl-cell--order-10-desktop{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-desktop.mdl-cell--order-11-desktop{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-desktop.mdl-cell--order-12-desktop{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:calc(8.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:8.3333333333%}.mdl-cell--2-offset,.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:calc(16.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:16.6666666667%}.mdl-cell--3-offset,.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:25%}.mdl-cell--4-offset,.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:calc(33.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:33.3333333333%}.mdl-cell--5-offset,.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:calc(41.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:41.6666666667%}.mdl-cell--6-offset,.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:50%}.mdl-cell--7-offset,.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:calc(58.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:58.3333333333%}.mdl-cell--8-offset,.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:calc(66.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:66.6666666667%}.mdl-cell--9-offset,.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:75%}.mdl-cell--10-offset,.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:calc(83.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:83.3333333333%}.mdl-cell--11-offset,.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:calc(91.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:91.6666666667%}}
-/*# sourceMappingURL=material.min.css.map */
diff --git a/etc/cli.angular.io/theme.css b/etc/cli.angular.io/theme.css
deleted file mode 100644
index b6a336e98b0c..000000000000
--- a/etc/cli.angular.io/theme.css
+++ /dev/null
@@ -1 +0,0 @@
-.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}
diff --git a/integration/angular_cli/e2e/tsconfig.json b/integration/angular_cli/e2e/tsconfig.json
index c92199cfd63f..a82df00eef37 100644
--- a/integration/angular_cli/e2e/tsconfig.json
+++ b/integration/angular_cli/e2e/tsconfig.json
@@ -6,7 +6,6 @@
     "target": "es2018",
     "types": [
       "jasmine",
-      "jasminewd2",
       "node"
     ]
   }
diff --git a/integration/angular_cli/karma.conf.js b/integration/angular_cli/karma.conf.js
index a9c5297de149..646bfde5c8a6 100644
--- a/integration/angular_cli/karma.conf.js
+++ b/integration/angular_cli/karma.conf.js
@@ -18,6 +18,9 @@ module.exports = function (config) {
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageReporter: {
       dir: path.join(__dirname, 'coverage'),
       subdir: '.',
diff --git a/integration/angular_cli/package.json b/integration/angular_cli/package.json
index feba5be5709a..fb653a1c165a 100644
--- a/integration/angular_cli/package.json
+++ b/integration/angular_cli/package.json
@@ -8,7 +8,7 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e --prod",
-    "postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 85.0.4183.38"
+    "postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 89.0.4389.0"
   },
   "private": true,
   "dependencies": {
@@ -30,7 +30,6 @@
     "@angular/compiler-cli": "~9.1.1",
     "@types/node": "^12.11.1",
     "@types/jasmine": "~3.5.0",
-    "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -40,10 +39,10 @@
     "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~5.4.3",
-    "puppeteer": "5.2.1",
+    "puppeteer": "6.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.9.2"
+    "typescript": "~4.0.0"
   },
   "resolutions": {
     "rxjs": "6.5.4",
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index e491aad25108..b8fbe0962bb8 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/lib/packages.ts b/lib/packages.ts
index dff7a59efbe1..68f76ef586bb 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -41,8 +41,12 @@ export interface PackageInfo {
 export type PackageMap = { [name: string]: PackageInfo };
 
 
+export function loadRootPackageJson() {
+  return require('../package.json');
+}
+
 function loadPackageJson(p: string) {
-  const root = require('../package.json');
+  const root = loadRootPackageJson();
   const pkg = require(p);
 
   for (const key of Object.keys(root)) {
@@ -84,7 +88,7 @@ function loadPackageJson(p: string) {
       case 'engines':
         pkg['engines'] = {
           'node': '>= 10.13.0',
-          'npm': '>= 6.11.0',
+          'npm': '^6.11.0 || ^7.5.6',
           'yarn': '>= 1.13.0',
         };
         break;
@@ -156,25 +160,8 @@ function _getSnapshotHash(_pkg: PackageInfo): string {
 }
 
 
-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.');
-  if (hasLocalChanges) {
-    stableVersion += stableVersion.includes('+') ? '.with-local-changes' : '+with-local-changes';
-  }
-
-  experimentalVersion = stableToExperimentalVersion(stableVersion);
-
-  return experimental ? experimentalVersion : stableVersion;
-}
+const stableVersion = loadRootPackageJson().version;
+const experimentalVersion = stableToExperimentalVersion(stableVersion);
 
 /**
  * Convert a stable version to its experimental equivalent. For example,
@@ -241,9 +228,7 @@ export const packages: PackageMap =
 
         dependencies: [],
         reverseDependencies: [],
-        get version() {
-          return _getVersionFromGit(experimental);
-        },
+        version: experimental ? experimentalVersion : stableVersion,
       };
 
       return packages;
diff --git a/lib/registries.ts b/lib/registries.ts
index 0bfea087bc2e..2e21b8a4716d 100644
--- a/lib/registries.ts
+++ b/lib/registries.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/package.json b/package.json
index 57e213e6c2f1..6e635d9486f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular/devkit-repo",
-  "version": "0.0.0",
+  "version": "11.2.19",
   "private": true,
   "description": "Software Development Kit for Angular",
   "bin": {
@@ -33,9 +33,9 @@
     "templates": "node ./bin/devkit-admin templates",
     "validate": "node ./bin/devkit-admin validate",
     "preinstall": "node ./tools/yarn/check-yarn.js",
-    "postinstall": "yarn webdriver-update && yarn ngcc",
+    "postinstall": "yarn webdriver-update && yarn ngcc && yarn husky install",
     "//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
-    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 85.0.4183.38",
+    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 89.0.4389.0",
     "ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
   },
   "repository": {
@@ -64,34 +64,35 @@
     ]
   },
   "devDependencies": {
-    "@angular/animations": "11.0.0-next.6",
-    "@angular/cdk": "10.2.5",
-    "@angular/common": "11.0.0-next.6",
-    "@angular/compiler": "11.0.0-next.6",
-    "@angular/compiler-cli": "11.0.0-next.6",
-    "@angular/core": "11.0.0-next.6",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#d79eccd725b4421e50b566bf001f553b561e3813",
-    "@angular/forms": "11.0.0-next.6",
-    "@angular/localize": "11.0.0-next.6",
-    "@angular/material": "10.2.5",
-    "@angular/platform-browser": "11.0.0-next.6",
-    "@angular/platform-browser-dynamic": "11.0.0-next.6",
-    "@angular/platform-server": "11.0.0-next.6",
-    "@angular/router": "11.0.0-next.6",
-    "@angular/service-worker": "11.0.0-next.6",
-    "@babel/core": "7.11.6",
-    "@babel/generator": "7.11.6",
-    "@babel/plugin-transform-runtime": "7.11.5",
-    "@babel/preset-env": "7.11.5",
-    "@babel/runtime": "7.11.2",
-    "@babel/template": "7.10.4",
-    "@bazel/bazelisk": "1.7.2",
-    "@bazel/buildifier": "3.5.0",
-    "@bazel/jasmine": "2.2.1",
-    "@bazel/typescript": "2.2.1",
-    "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-    "@types/babel__core": "7.1.10",
-    "@types/babel__template": "7.0.3",
+    "@angular/animations": "11.2.0-next.0",
+    "@angular/cdk": "11.1.1",
+    "@angular/common": "11.2.0-next.0",
+    "@angular/compiler": "11.2.0-next.0",
+    "@angular/compiler-cli": "11.2.0-next.0",
+    "@angular/core": "11.2.0-next.0",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0fd0f441648577e8c3966e9b59a88fefe350f514",
+    "@angular/forms": "11.2.0-next.0",
+    "@angular/localize": "11.2.0-next.0",
+    "@angular/material": "11.1.1",
+    "@angular/platform-browser": "11.2.0-next.0",
+    "@angular/platform-browser-dynamic": "11.2.0-next.0",
+    "@angular/platform-server": "11.2.0-next.0",
+    "@angular/router": "11.2.0-next.0",
+    "@angular/service-worker": "11.2.0-next.0",
+    "@babel/core": "7.12.10",
+    "@babel/generator": "7.12.11",
+    "@babel/plugin-transform-runtime": "7.12.10",
+    "@babel/preset-env": "7.12.11",
+    "@babel/runtime": "7.12.5",
+    "@babel/template": "7.12.7",
+    "@bazel/bazelisk": "1.7.3",
+    "@bazel/buildifier": "4.0.0",
+    "@bazel/jasmine": "3.2.1",
+    "@bazel/typescript": "3.2.1",
+    "@discoveryjs/json-ext": "0.5.2",
+    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
+    "@types/babel__core": "7.1.12",
+    "@types/babel__template": "7.4.0",
     "@types/browserslist": "^4.4.0",
     "@types/cacache": "^12.0.1",
     "@types/caniuse-lite": "^1.0.0",
@@ -101,10 +102,11 @@
     "@types/express": "^4.16.0",
     "@types/find-cache-dir": "^3.0.0",
     "@types/glob": "^7.1.1",
+    "@types/http-proxy": "^1.17.4",
     "@types/inquirer": "^7.3.0",
-    "@types/jasmine": "~3.5.0",
+    "@types/jasmine": "~3.6.0",
     "@types/karma": "^5.0.0",
-    "@types/license-checker-webpack-plugin": "^0.0.2",
+    "@types/license-checker-webpack-plugin": "^0.0.3",
     "@types/loader-utils": "^2.0.0",
     "@types/minimatch": "3.0.3",
     "@types/minimist": "^1.2.0",
@@ -128,119 +130,117 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ajv": "6.12.6",
     "ansi-colors": "4.1.1",
-    "autoprefixer": "9.8.6",
-    "babel-loader": "8.1.0",
+    "autoprefixer": "10.2.4",
+    "babel-loader": "8.2.2",
     "bootstrap": "^4.0.0",
     "browserslist": "^4.9.1",
     "cacache": "15.0.5",
     "caniuse-lite": "^1.0.30001032",
-    "circular-dependency-plugin": "5.2.0",
+    "circular-dependency-plugin": "5.2.2",
     "codelyzer": "^6.0.0",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^3.0.0",
     "conventional-commits-parser": "^3.0.0",
-    "copy-webpack-plugin": "6.2.1",
-    "core-js": "3.6.5",
-    "css-loader": "5.0.0",
-    "cssnano": "4.1.10",
+    "copy-webpack-plugin": "6.3.2",
+    "core-js": "3.8.3",
+    "critters": "0.0.12",
+    "css-loader": "5.0.1",
+    "cssnano": "5.0.2",
     "debug": "^4.1.1",
-    "enhanced-resolve": "5.2.0",
+    "enhanced-resolve": "5.7.0",
     "express": "4.17.1",
     "fast-json-stable-stringify": "2.1.0",
-    "file-loader": "6.1.1",
+    "file-loader": "6.2.0",
     "find-cache-dir": "3.3.1",
     "font-awesome": "^4.7.0",
     "gh-got": "^9.0.0",
     "git-raw-commits": "^2.0.0",
     "glob": "7.1.6",
-    "husky": "^4.0.10",
+    "http-proxy": "^1.18.1",
+    "https-proxy-agent": "5.0.0",
+    "husky": "5.0.8",
     "inquirer": "7.3.3",
     "jasmine": "^3.3.1",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~6.0.0",
-    "jest-worker": "26.5.0",
+    "jest-worker": "26.6.2",
     "jquery": "^3.3.1",
-    "jsonc-parser": "2.3.1",
-    "karma": "~5.2.0",
+    "jsonc-parser": "3.0.0",
+    "karma": "~6.1.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-source-map-support": "1.4.0",
-    "less": "3.12.2",
-    "less-loader": "7.0.2",
+    "less": "4.1.1",
+    "less-loader": "7.3.0",
     "license-checker": "^25.0.0",
-    "license-checker-webpack-plugin": "0.1.5",
+    "license-checker-webpack-plugin": "0.2.1",
     "loader-utils": "2.0.0",
-    "mini-css-extract-plugin": "1.0.0",
+    "magic-string": "0.25.7",
+    "mini-css-extract-plugin": "1.3.5",
     "minimatch": "3.0.4",
-    "minimist": "^1.2.0",
-    "ng-packagr": "~11.0.0-next.0",
+    "minimist": "1.2.6",
+    "ng-packagr": "~11.1.0",
     "node-fetch": "^2.2.0",
     "npm-registry-client": "8.6.0",
-    "open": "7.3.0",
-    "ora": "5.1.0",
-    "pacote": "11.1.4",
+    "open": "7.4.0",
+    "ora": "5.3.0",
+    "pacote": "11.2.4",
     "parse5-html-rewriting-stream": "6.0.1",
     "pidtree": "^0.5.0",
     "pidusage": "^2.0.17",
     "pnp-webpack-plugin": "1.6.4",
     "popper.js": "^1.14.1",
-    "postcss": "7.0.32",
-    "postcss-import": "12.0.1",
-    "postcss-loader": "4.0.4",
+    "postcss": "8.2.15",
+    "postcss-import": "14.0.0",
+    "postcss-loader": "4.2.0",
     "prettier": "^2.0.0",
     "protractor": "~7.0.0",
-    "puppeteer": "5.3.1",
-    "quicktype-core": "^6.0.15",
+    "puppeteer": "6.0.0",
+    "quicktype-core": "^6.0.69",
     "raw-loader": "4.0.2",
     "regenerator-runtime": "0.13.7",
-    "resolve-url-loader": "3.1.1",
+    "resolve-url-loader": "4.0.0",
     "rimraf": "3.0.2",
-    "rollup": "2.30.0",
+    "rollup": "2.38.4",
     "rxjs": "6.6.3",
-    "sass": "1.27.0",
-    "sass-loader": "10.0.3",
-    "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz",
-    "semver": "7.3.2",
+    "sass": "1.32.6",
+    "sass-loader": "10.1.1",
+    "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz",
+    "semver": "7.3.4",
     "source-map": "0.7.3",
-    "source-map-loader": "1.1.1",
-    "source-map-support": "0.5.16",
+    "source-map-loader": "1.1.3",
+    "source-map-support": "0.5.19",
     "spdx-satisfies": "^5.0.0",
-    "speed-measure-webpack-plugin": "1.3.3",
+    "speed-measure-webpack-plugin": "1.4.2",
     "style-loader": "2.0.0",
-    "stylus": "0.54.7",
-    "stylus-loader": "4.1.1",
-    "symbol-observable": "2.0.3",
+    "stylus": "0.54.8",
+    "stylus-loader": "4.3.3",
+    "symbol-observable": "3.0.0",
     "tar": "^6.0.0",
     "temp": "^0.9.0",
-    "terser": "5.3.5",
+    "terser": "5.5.1",
     "terser-webpack-plugin": "4.2.3",
     "text-table": "0.2.0",
     "through2": "^4.0.0",
     "tree-kill": "1.2.2",
-    "ts-api-guardian": "0.5.0",
+    "ts-api-guardian": "0.6.0",
     "ts-node": "^5.0.0",
     "tslib": "^2.0.0",
     "tslint": "^6.1.3",
     "tslint-no-circular-imports": "^0.7.0",
     "tslint-sonarts": "1.9.0",
-    "typescript": "4.0.3",
-    "verdaccio": "4.8.1",
+    "typescript": "4.1.5",
+    "verdaccio": "4.11.0",
     "verdaccio-auth-memory": "^9.7.2",
     "webpack": "4.44.2",
     "webpack-dev-middleware": "3.7.2",
-    "webpack-dev-server": "3.10.3",
-    "webpack-merge": "5.2.0",
-    "webpack-sources": "2.0.1",
-    "webpack-subresource-integrity": "1.5.0",
+    "webpack-dev-server": "3.11.3",
+    "webpack-merge": "5.7.3",
+    "webpack-sources": "2.2.0",
+    "webpack-subresource-integrity": "1.5.2",
     "worker-plugin": "5.0.0",
-    "zone.js": "^0.10.2"
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS",
-      "prepare-commit-msg": "yarn -s ng-dev commit-message restore-commit-message-draft --file-env-variable HUSKY_GIT_PARAMS"
-    }
+    "zone.js": "^0.11.3"
   }
 }
diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel
index 8395b2a215eb..9e20fc349a84 100644
--- a/packages/angular/cli/BUILD.bazel
+++ b/packages/angular/cli/BUILD.bazel
@@ -46,7 +46,7 @@ ts_library(
         "//packages/angular/cli:commands/update.ts",
         "//packages/angular/cli:commands/version.ts",
         "//packages/angular/cli:commands/run.ts",
-        "//packages/angular/cli:commands/xi18n.ts",
+        "//packages/angular/cli:commands/extract-i18n.ts",
         # @external_end
     ],
     data = glob(
@@ -69,6 +69,7 @@ ts_library(
         "//packages/angular_devkit/core/node",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics/tools",
+        "@npm//@angular/core",
         "@npm//@types/debug",
         "@npm//@types/inquirer",
         "@npm//@types/node",
@@ -78,6 +79,9 @@ ts_library(
         "@npm//@types/universal-analytics",
         "@npm//@types/uuid",
         "@npm//ansi-colors",
+        "@npm//jsonc-parser",
+        "@npm//open",
+        "@npm//ora",
     ],
 )
 
@@ -223,8 +227,8 @@ ts_json_schema(
 )
 
 ts_json_schema(
-    name = "xi18n_schema",
-    src = "commands/xi18n.json",
+    name = "extract-i18n_schema",
+    src = "commands/extract-i18n.json",
     data = [
         "commands/definitions.json",
     ],
diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index c4c5e25a8440..96b40aacbad5 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -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://angular.io/cli).
+The documentation for the Angular CLI is located on our [documentation website](https://angular.io/cli).
 
 ## License
 
diff --git a/packages/angular/cli/commands.json b/packages/angular/cli/commands.json
index 85de6cc170d3..0b65947a0647 100644
--- a/packages/angular/cli/commands.json
+++ b/packages/angular/cli/commands.json
@@ -6,6 +6,7 @@
   "deploy": "./commands/deploy.json",
   "doc": "./commands/doc.json",
   "e2e": "./commands/e2e.json",
+  "extract-i18n": "./commands/extract-i18n.json",
   "make-this-awesome": "./commands/easter-egg.json",
   "generate": "./commands/generate.json",
   "help": "./commands/help.json",
@@ -15,6 +16,5 @@
   "serve": "./commands/serve.json",
   "test": "./commands/test.json",
   "update": "./commands/update.json",
-  "version": "./commands/version.json",
-  "xi18n": "./commands/xi18n.json"
+  "version": "./commands/version.json"
 }
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 321601e22e22..a58f7ec33e95 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -13,15 +13,16 @@ import { PackageManager } from '../lib/config/schema';
 import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
 import { RunSchematicOptions, SchematicCommand } from '../models/schematic-command';
-import { installPackage, installTempPackage } from '../tasks/install-package';
 import { colors } from '../utilities/color';
-import { getPackageManager } from '../utilities/package-manager';
+import { installPackage, installTempPackage } from '../utilities/install-package';
+import { ensureCompatibleNpm, getPackageManager } from '../utilities/package-manager';
 import {
   NgAddSaveDepedency,
   PackageManifest,
   fetchPackageManifest,
   fetchPackageMetadata,
 } from '../utilities/package-metadata';
+import { Spinner } from '../utilities/spinner';
 import { Schema as AddCommandSchema } from './add';
 
 const npa = require('npm-package-arg');
@@ -38,6 +39,8 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
   }
 
   async run(options: AddCommandSchema & Arguments) {
+    await ensureCompatibleNpm(this.context.root);
+
     if (!options.collection) {
       this.logger.fatal(
         `The "ng add" command requires a name argument to be specified eg. ` +
@@ -79,12 +82,18 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       }
     }
 
+    const spinner = new Spinner();
+
+    spinner.start('Determining package manager...');
     const packageManager = await getPackageManager(this.context.root);
     const usingYarn = packageManager === PackageManager.Yarn;
+    spinner.info(`Using package manager: ${colors.grey(packageManager)}`);
 
     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
+      spinner.start('Searching for compatible package version...');
+
       let packageMetadata;
       try {
         packageMetadata = await fetchPackageMetadata(packageIdentifier.name, this.logger, {
@@ -93,7 +102,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
           verbose: options.verbose,
         });
       } catch (e) {
-        this.logger.error('Unable to fetch package metadata: ' + e.message);
+        spinner.fail('Unable to load package information from registry: ' + e.message);
 
         return 1;
       }
@@ -111,11 +120,14 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
           ) {
             packageIdentifier = npa.resolve('@angular/pwa', '0.12');
           }
+        } else {
+          packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
         }
+        spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
       } else if (!latestManifest || (await this.hasMismatchedPeer(latestManifest))) {
         // 'latest' is invalid so search for most recent matching package
         const versionManifests = Object.values(packageMetadata.versions).filter(
-          (value: PackageManifest) => !prerelease(value.version),
+          (value: PackageManifest) => !prerelease(value.version) && !value.deprecated,
         ) as PackageManifest[];
 
         versionManifests.sort((a, b) => rcompare(a.version, b.version, true));
@@ -129,10 +141,14 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         }
 
         if (!newIdentifier) {
-          this.logger.warn("Unable to find compatible package.  Using 'latest'.");
+          spinner.warn("Unable to find compatible package.  Using 'latest'.");
         } else {
           packageIdentifier = newIdentifier;
+          spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
         }
+      } else {
+        packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
+        spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
       }
     }
 
@@ -140,6 +156,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     let savePackage: NgAddSaveDepedency | undefined;
 
     try {
+      spinner.start('Loading package information from registry...');
       const manifest = await fetchPackageManifest(packageIdentifier, this.logger, {
         registry: options.registry,
         verbose: options.verbose,
@@ -150,41 +167,51 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       collectionName = manifest.name;
 
       if (await this.hasMismatchedPeer(manifest)) {
-        this.logger.warn(
+        spinner.warn(
           'Package has unmet peer dependencies. Adding the package may not succeed.',
         );
+      } else {
+        spinner.succeed(`Package information loaded.`);
       }
     } catch (e) {
-      this.logger.error('Unable to fetch package manifest: ' + e.message);
+      spinner.fail(`Unable to fetch package information for '${packageIdentifier}': ${e.message}`);
 
       return 1;
     }
 
-    if (savePackage === false) {
-      // Temporary packages are located in a different directory
-      // Hence we need to resolve them using the temp path
-      const tempPath = installTempPackage(
-        packageIdentifier.raw,
-        this.logger,
-        packageManager,
-        options.registry ? [`--registry="${options.registry}"`] : undefined,
-      );
-      const resolvedCollectionPath = require.resolve(
-        join(collectionName, 'package.json'),
-        {
-          paths: [tempPath],
-        },
-      );
+    try {
+      spinner.start('Installing package...');
+      if (savePackage === false) {
+        // Temporary packages are located in a different directory
+        // Hence we need to resolve them using the temp path
+        const tempPath = installTempPackage(
+          packageIdentifier.raw,
+          undefined,
+          packageManager,
+          options.registry ? [`--registry="${options.registry}"`] : undefined,
+        );
+        const resolvedCollectionPath = require.resolve(
+          join(collectionName, 'package.json'),
+          {
+            paths: [tempPath],
+          },
+        );
 
-      collectionName = dirname(resolvedCollectionPath);
-    } else {
-      installPackage(
-        packageIdentifier.raw,
-        this.logger,
-        packageManager,
-        savePackage,
-        options.registry ? [`--registry="${options.registry}"`] : undefined,
-      );
+        collectionName = dirname(resolvedCollectionPath);
+      } else {
+        installPackage(
+          packageIdentifier.raw,
+          undefined,
+          packageManager,
+          savePackage,
+          options.registry ? [`--registry="${options.registry}"`] : undefined,
+        );
+      }
+      spinner.succeed('Package successfully installed.');
+    } catch (error) {
+      spinner.fail(`Package installation failed: ${error.message}`);
+
+      return 1;
     }
 
     return this.executeSchematic(collectionName, options['--']);
diff --git a/packages/angular/cli/commands/analytics-impl.ts b/packages/angular/cli/commands/analytics-impl.ts
index 9174005d7b18..9897437d50c0 100644
--- a/packages/angular/cli/commands/analytics-impl.ts
+++ b/packages/angular/cli/commands/analytics-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 0bdd50b57949..e0336279a456 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index 4e10498f4cd5..a28a5f56d532 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -3,7 +3,7 @@ When used to build a library, a different builder is invoked, and only the `ts-c
 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.
+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` 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.
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 944ca1df100a..3144f23f7bd9 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -1,21 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  InvalidJsonCharacterException,
-  JsonArray,
-  JsonObject,
-  JsonParseMode,
-  JsonValue,
-  parseJson,
-  tags,
-} from '@angular-devkit/core';
-import { writeFileSync } from 'fs';
+import { JsonValue, tags } from '@angular-devkit/core';
 import { v4 as uuidV4 } from 'uuid';
 import { Command } from '../models/command';
 import { Arguments, CommandScope } from '../models/interface';
@@ -24,50 +15,16 @@ import {
   migrateLegacyGlobalConfig,
   validateWorkspace,
 } from '../utilities/config';
-import { Schema as ConfigCommandSchema, Value as ConfigCommandSchemaValue } from './config';
-
-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 _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],
+import { JSONFile, parseJson } from '../utilities/json-file';
+import { Schema as ConfigCommandSchema } from './config';
+
+const validCliPaths = new Map<string, ((arg: string | number | boolean | undefined) => string) | undefined>([
+  ['cli.warnings.versionMismatch', undefined],
+  ['cli.defaultCollection', undefined],
+  ['cli.packageManager', undefined],
+  ['cli.analytics', undefined],
+  ['cli.analyticsSharing.tracking', undefined],
+  ['cli.analyticsSharing.uuid', v => v ? `${v}` : uuidV4()],
 ]);
 
 /**
@@ -106,92 +63,17 @@ function parseJsonPath(path: string): (string | number)[] {
   return result.filter(fragment => fragment != null);
 }
 
-function getValueFromPath<T extends JsonArray | JsonObject>(
-  root: T,
-  path: string,
-): JsonValue | undefined {
-  const fragments = parseJsonPath(path);
-
-  try {
-    return fragments.reduce((value: JsonValue | undefined, current: string | number) => {
-      if (value == undefined || typeof value != 'object') {
-        return undefined;
-      } else if (typeof current == 'string' && !Array.isArray(value)) {
-        return value[current];
-      } else if (typeof current == 'number' && Array.isArray(value)) {
-        return value[current];
-      } else {
-        return undefined;
-      }
-    }, root);
-  } catch {
-    return undefined;
-  }
-}
-
-function setValueFromPath<T extends JsonArray | JsonObject>(
-  root: T,
-  path: string,
-  newValue: JsonValue,
-): JsonValue | undefined {
-  const fragments = parseJsonPath(path);
-
-  try {
-    return fragments.reduce((value: JsonValue | undefined, current: string | number, index: number) => {
-      if (value == undefined || typeof value != 'object') {
-        return undefined;
-      } else if (typeof current == 'string' && !Array.isArray(value)) {
-        if (index === fragments.length - 1) {
-          value[current] = newValue;
-        } else if (value[current] == undefined) {
-          if (typeof fragments[index + 1] == 'number') {
-            value[current] = [];
-          } else if (typeof fragments[index + 1] == 'string') {
-            value[current] = {};
-          }
-        }
-
-        return value[current];
-      } else if (typeof current == 'number' && Array.isArray(value)) {
-        if (index === fragments.length - 1) {
-          value[current] = newValue;
-        } else if (value[current] == undefined) {
-          if (typeof fragments[index + 1] == 'number') {
-            value[current] = [];
-          } else if (typeof fragments[index + 1] == 'string') {
-            value[current] = {};
-          }
-        }
-
-        return value[current];
-      } else {
-        return undefined;
-      }
-    }, root);
-  } catch {
-    return undefined;
-  }
-}
-
-function normalizeValue(value: ConfigCommandSchemaValue, path: string): JsonValue {
-  const cliOptionType = validCliPaths.get(path);
-  if (cliOptionType) {
-    return cliOptionType('' + value);
-  }
-
-  if (typeof value === 'string') {
-    try {
-      return parseJson(value, JsonParseMode.Loose);
-    } catch (e) {
-      if (e instanceof InvalidJsonCharacterException && !value.startsWith('{')) {
-        return value;
-      } else {
-        throw e;
-      }
-    }
+function normalizeValue(value: string | undefined | boolean | number): JsonValue | undefined {
+  const valueString = `${value}`.trim();
+  if (valueString === 'true') {
+    return true;
+  } else if (valueString === 'false') {
+    return false;
+  } else if (isFinite(+valueString)) {
+    return +valueString;
   }
 
-  return value;
+  return value || undefined;
 }
 
 export class ConfigCommand extends Command<ConfigCommandSchema> {
@@ -212,7 +94,7 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
             We found a global configuration that was used in Angular CLI 1.
             It has been automatically migrated.`);
         }
-      } catch {}
+      } catch { }
     }
 
     if (options.value == undefined) {
@@ -222,35 +104,35 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
         return 1;
       }
 
-      return this.get(config.value, options);
+      return this.get(config, options);
     } else {
       return this.set(options);
     }
   }
 
-  private get(config: JsonObject, options: ConfigCommandSchema) {
+  private get(jsonFile: JSONFile, options: ConfigCommandSchema) {
     let value;
     if (options.jsonPath) {
-      value = getValueFromPath(config, options.jsonPath);
+      value = jsonFile.get(parseJsonPath(options.jsonPath));
     } else {
-      value = config;
+      value = jsonFile.content;
     }
 
     if (value === undefined) {
       this.logger.error('Value cannot be found.');
 
       return 1;
-    } else if (typeof value == 'object') {
-      this.logger.info(JSON.stringify(value, null, 2));
+    } else if (typeof value === 'string') {
+      this.logger.info(value);
     } else {
-      this.logger.info(value.toString());
+      this.logger.info(JSON.stringify(value, null, 2));
     }
 
     return 0;
   }
 
   private async set(options: ConfigCommandSchema) {
-    if (!options.jsonPath || !options.jsonPath.trim()) {
+    if (!options.jsonPath?.trim()) {
       throw new Error('Invalid Path.');
     }
 
@@ -269,28 +151,25 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
       return 1;
     }
 
-    // TODO: Modify & save without destroying comments
-    const configValue = config.value;
-
-    const value = normalizeValue(options.value || '', options.jsonPath);
-    const result = setValueFromPath(configValue, options.jsonPath, value);
+    const jsonPath = parseJsonPath(options.jsonPath);
+    const value = validCliPaths.get(options.jsonPath)?.(options.value) ?? options.value;
+    const modified = config.modify(jsonPath, normalizeValue(value));
 
-    if (result === undefined) {
+    if (!modified) {
       this.logger.error('Value cannot be found.');
 
       return 1;
     }
 
     try {
-      await validateWorkspace(configValue);
+      await validateWorkspace(parseJson(config.content));
     } catch (error) {
       this.logger.fatal(error.message);
 
       return 1;
     }
 
-    const output = JSON.stringify(configValue, null, 2);
-    writeFileSync(configPath, output);
+    config.save();
 
     return 0;
   }
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index d0c3d59520b3..21a289f269d6 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -31,7 +31,7 @@
         },
         "global": {
           "type": "boolean",
-          "description": "When true, accesses the global configuration in the caller's home directory.",
+          "description": "Access 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 1713520fc1d1..222a790bf09e 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.\nSetting this explicitly overrides the \"--prod\" flag",
+          "description": "One or more named builder configurations as a comma-separated list as specified in the \"configurations\" section of angular.json.\nThe builder uses the named configurations to run the given target.\nFor more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.\nSetting this explicitly overrides the \"--prod\" flag.",
           "type": "string",
           "aliases": [
             "c"
           ]
         },
         "prod": {
-          "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.",
+          "description": "Shorthand for \"--configuration=production\".\nSet 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"
         }
       }
@@ -42,13 +42,13 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "When true, runs through and reports activity without writing out results."
+          "description": "Run through and reports activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "When true, forces overwriting of existing files."
+          "description": "Force overwriting of existing files."
         }
       }
     },
@@ -57,12 +57,12 @@
         "interactive": {
           "type": "boolean",
           "default": "true",
-          "description": "When false, disables interactive input prompts."
+          "description": "Enable interactive input prompts."
         },
         "defaults": {
           "type": "boolean",
           "default": "false",
-          "description": "When true, disables interactive input prompts for options with a default."
+          "description": "Disable interactive input prompts for options with a default."
         }
       }
     }
diff --git a/packages/angular/cli/commands/deploy-impl.ts b/packages/angular/cli/commands/deploy-impl.ts
index 9ce45a22ed28..819b63f61986 100644
--- a/packages/angular/cli/commands/deploy-impl.ts
+++ b/packages/angular/cli/commands/deploy-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/deploy-long.md b/packages/angular/cli/commands/deploy-long.md
index 5d600ef2e8d8..afe619565c0a 100644
--- a/packages/angular/cli/commands/deploy-long.md
+++ b/packages/angular/cli/commands/deploy-long.md
@@ -8,15 +8,15 @@ For example:
 
 ```json
 "projects": {
-     "my-project": {
-         ...
-        "architect": {
-            ...
-            "deploy": {
-                "builder": "@angular/fire:deploy",
-                "options": {}
-                }
-            }
-        }
+  "my-project": {
+    ...
+    "architect": {
+      ...
+      "deploy": {
+        "builder": "@angular/fire:deploy",
+        "options": {}
+      }
     }
+  }
+}
  ```
\ No newline at end of file
diff --git a/packages/angular/cli/commands/deploy.json b/packages/angular/cli/commands/deploy.json
index 9bfc66786ca4..30e84ab4e0ac 100644
--- a/packages/angular/cli/commands/deploy.json
+++ b/packages/angular/cli/commands/deploy.json
@@ -20,7 +20,7 @@
           }
         },
         "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": "One or more named builder configurations as a comma-separated list as specified in the \"configurations\" section of angular.json.\nThe builder uses the named configurations to run the given target.\nFor more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.",
           "type": "string",
           "aliases": [
             "c"
diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 587d760c3346..6369fe2fd054 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -1,17 +1,16 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 open from 'open';
 import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
 import { Schema as DocCommandSchema } from './doc';
 
-const open = require('open');
-
 export class DocCommand extends Command<DocCommandSchema> {
   public async run(options: DocCommandSchema & Arguments) {
     if (!options.keyword) {
@@ -39,7 +38,7 @@ export class DocCommand extends Command<DocCommandSchema> {
       // and use it if we can find it
       try {
         /* tslint:disable-next-line:no-implicit-dependencies */
-        const currentNgVersion = require('@angular/core').VERSION.major;
+        const currentNgVersion = (await import('@angular/core')).VERSION.major;
         domain = `v${currentNgVersion}.angular.io`;
       } catch (e) { }
     }
@@ -50,11 +49,8 @@ export class DocCommand extends Command<DocCommandSchema> {
       searchUrl = `https://${domain}/docs?search=${options.keyword}`;
     }
 
-    // We should wrap `open` in a new Promise because `open` is already resolved
-    await new Promise(() => {
-      open(searchUrl, {
-        wait: false,
-      });
+    await open(searchUrl, {
+      wait: false,
     });
   }
 }
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index b43f448d03cb..eb8c31d935bd 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -24,7 +24,7 @@
           "aliases": ["s"],
           "type": "boolean",
           "default": false,
-          "description": "When true, searches all of angular.io. Otherwise, searches only API reference documentation."
+          "description": "Search all of angular.io. Otherwise, searches only API reference documentation."
         },
         "version" : {
           "oneOf": [
diff --git a/packages/angular/cli/commands/e2e-impl.ts b/packages/angular/cli/commands/e2e-impl.ts
index f24a44ca4122..1fe6a373ba2c 100644
--- a/packages/angular/cli/commands/e2e-impl.ts
+++ b/packages/angular/cli/commands/e2e-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/easter-egg-impl.ts b/packages/angular/cli/commands/easter-egg-impl.ts
index 8e70d46dc827..22e43d6fe996 100644
--- a/packages/angular/cli/commands/easter-egg-impl.ts
+++ b/packages/angular/cli/commands/easter-egg-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/xi18n-impl.ts b/packages/angular/cli/commands/extract-i18n-impl.ts
similarity index 56%
rename from packages/angular/cli/commands/xi18n-impl.ts
rename to packages/angular/cli/commands/extract-i18n-impl.ts
index ae0e9253a3ca..e41e9bcd26f1 100644
--- a/packages/angular/cli/commands/xi18n-impl.ts
+++ b/packages/angular/cli/commands/extract-i18n-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,12 +8,12 @@
 
 import { ArchitectCommand } from '../models/architect-command';
 import { Arguments } from '../models/interface';
-import { Schema as Xi18nCommandSchema } from './xi18n';
+import { Schema as ExtractI18nCommandSchema } from './extract-i18n';
 
-export class Xi18nCommand extends ArchitectCommand<Xi18nCommandSchema> {
+export class ExtractI18nCommand extends ArchitectCommand<ExtractI18nCommandSchema> {
   public readonly target = 'extract-i18n';
 
-  public async run(options: Xi18nCommandSchema & Arguments) {
+  public async run(options: ExtractI18nCommandSchema & Arguments) {
     const version = process.version.substr(1).split('.');
     if (Number(version[0]) === 12 && Number(version[1]) === 0) {
       this.logger.error(
@@ -23,6 +23,11 @@ export class Xi18nCommand extends ArchitectCommand<Xi18nCommandSchema> {
       return 1;
     }
 
+    const commandName = process.argv[2];
+    if (['xi18n', 'i18n-extract'].includes(commandName)) {
+      this.logger.warn(`Warning: "ng ${commandName}" has been deprecated and will be removed in a future major version. Please use "ng extract-i18n" instead.`);
+    }
+
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/xi18n.json b/packages/angular/cli/commands/extract-i18n.json
similarity index 70%
rename from packages/angular/cli/commands/xi18n.json
rename to packages/angular/cli/commands/extract-i18n.json
index c48d958440fa..85ecb0ffeeed 100644
--- a/packages/angular/cli/commands/xi18n.json
+++ b/packages/angular/cli/commands/extract-i18n.json
@@ -1,13 +1,13 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "ng-cli://commands/xi18n.json",
+  "$id": "ng-cli://commands/extract-i18n.json",
   "description": "Extracts i18n messages from source code.",
   "$longDescription": "",
 
-  "$aliases": ["i18n-extract"],
+  "$aliases": ["i18n-extract", "xi18n"],
   "$scope": "in",
   "$type": "architect",
-  "$impl": "./xi18n-impl#Xi18nCommand",
+  "$impl": "./extract-i18n-impl#ExtractI18nCommand",
 
   "type": "object",
   "allOf": [
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index c32ccd7b87ea..6741be40f9e4 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index 9c30c5e2f608..82edd6a441b4 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/lint-impl.ts b/packages/angular/cli/commands/lint-impl.ts
index 6edd8556f994..acf415fcdc2a 100644
--- a/packages/angular/cli/commands/lint-impl.ts
+++ b/packages/angular/cli/commands/lint-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/lint-long.md b/packages/angular/cli/commands/lint-long.md
index 03917ffb252e..480b069f1e2c 100644
--- a/packages/angular/cli/commands/lint-long.md
+++ b/packages/angular/cli/commands/lint-long.md
@@ -1,4 +1,7 @@
 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.
 
-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
+The default linting tool is [TSLint](https://palantir.github.io/tslint/), and the default configuration is specified in the project's `tslint.json` file.
+
+**Note**: TSLint has been discontinued and support has been deprecated in the Angular CLI. The options shown below are for the deprecated TSLint builder.
+To opt-in using the community driven ESLint builder, see [angular-eslint](https://github.com/angular-eslint/angular-eslint#migrating-an-angular-cli-project-from-codelyzer-and-tslint) README.
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index b5f0221b3104..8bfd286e1b56 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -1,12 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
+import { ensureCompatibleNpm } from '../utilities/package-manager';
 import { Schema as NewCommandSchema } from './new';
 
 
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index 89cfbda500dd..47dc5861726a 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 an initial Angular app.",
+  "description": "Creates a new workspace and an initial Angular application.",
   "$longDescription": "./new.md",
 
   "$aliases": [ "n" ],
@@ -16,13 +16,13 @@
         "collection": {
           "type": "string",
           "aliases": [ "c" ],
-          "description": "A collection of schematics to use in generating the initial app."
+          "description": "A collection of schematics to use in generating the initial application."
         },
         "verbose": {
           "type": "boolean",
           "default": false,
           "aliases": [ "v" ],
-          "description": "When true, adds more details to output logging."
+          "description": "Add more details to output logging."
         }
       },
       "required": []
diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
index 822deb745ee1..5d344b5d4312 100644
--- a/packages/angular/cli/commands/new.md
+++ b/packages/angular/cli/commands/new.md
@@ -1,16 +1,16 @@
-Creates and initializes a new Angular app that is the default project for a new workspace.
+Creates and initializes a new Angular application that is the default project for a new workspace.
 
 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.
 
-* 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.
+* By default, the files for a new initial application (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.
+* The new application'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.
+* Subsequent applications 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
+If you plan to have multiple applications 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 application.
+This allows a workspace name different from the initial app name, and ensures that all applications reside in the `/projects` subfolder, matching the structure of the configuration file.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/run-impl.ts b/packages/angular/cli/commands/run-impl.ts
index feefe731fa5b..3a0968e55898 100644
--- a/packages/angular/cli/commands/run-impl.ts
+++ b/packages/angular/cli/commands/run-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index 4111cc014a67..b6c3d64bb065 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -22,7 +22,7 @@
           }
         },
         "configuration": {
-          "description": "A named builder configuration, defined in the \"configurations\" section of angular.json.\nThe builder uses the named configuration to run the given target.",
+          "description": "One or more named builder configurations as a comma-separated list as specified in the \"configurations\" section of angular.json.\nThe builder uses the named configurations to run the given target.\nFor more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.",
           "type": "string",
           "aliases": [ "c" ]
         }
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 04b51eee4e4a..fc5cf333b09c 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/test-impl.ts b/packages/angular/cli/commands/test-impl.ts
index 28f09df4d7b2..71d7b9147b36 100644
--- a/packages/angular/cli/commands/test-impl.ts
+++ b/packages/angular/cli/commands/test-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index b67d46aa1ec5..485fe6e05e65 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -11,13 +11,15 @@ import { execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
+import { VERSION } from '../lib/cli';
 import { PackageManager } from '../lib/config/schema';
 import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
-import { runTempPackageBin } from '../tasks/install-package';
+import { SchematicEngineHost } from '../models/schematic-engine-host';
 import { colors } from '../utilities/color';
+import { runTempPackageBin } from '../utilities/install-package';
 import { writeErrorToLogFile } from '../utilities/log-file';
-import { getPackageManager } from '../utilities/package-manager';
+import { ensureCompatibleNpm, getPackageManager } from '../utilities/package-manager';
 import {
   PackageIdentifier,
   PackageManifest,
@@ -41,11 +43,6 @@ const pickManifest = require('npm-pick-manifest') as (
 
 const oldConfigFileNames = ['.angular-cli.json', 'angular-cli.json'];
 
-const NG_VERSION_9_POST_MSG = colors.cyan(
-  '\nYour project has been updated to Angular version 9!\n' +
-  'For more info, please see: https://v9.angular.io/guide/updating-to-version-9',
-);
-
 /**
  * Disable CLI version mismatch checks and forces usage of the invoked CLI
  * instead of invoking the local installed version.
@@ -56,6 +53,8 @@ const disableVersionCheck =
   disableVersionCheckEnv !== '0' &&
   disableVersionCheckEnv.toLowerCase() !== 'false';
 
+const ANGULAR_PACKAGES_REGEXP = /^@(?:angular|nguniversal)\//;
+
 export class UpdateCommand extends Command<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
   private workflow!: NodeWorkflow;
@@ -63,16 +62,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
   async initialize() {
     this.packageManager = await getPackageManager(this.context.root);
-    this.workflow = new NodeWorkflow(
-      this.context.root,
-      {
-        packageManager: this.packageManager,
-        // __dirname -> favor @schematics/update from this package
-        // Otherwise, use packages from the active workspace (migrations)
-        resolvePaths: [__dirname, this.context.root],
-        schemaValidation: true,
-      },
-    );
+    this.workflow = new NodeWorkflow(this.context.root, {
+      packageManager: this.packageManager,
+      // __dirname -> favor @schematics/update from this package
+      // Otherwise, use packages from the active workspace (migrations)
+      resolvePaths: [__dirname, this.context.root],
+      schemaValidation: true,
+      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),
+    });
   }
 
   private async executeSchematic(
@@ -84,7 +81,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     let logs: string[] = [];
     const files = new Set<string>();
 
-    const reporterSubscription = this.workflow.reporter.subscribe(event => {
+    const reporterSubscription = this.workflow.reporter.subscribe((event) => {
       // Strip leading slash to prevent confusion.
       const eventPath = event.path.startsWith('/') ? event.path.substr(1) : event.path;
 
@@ -114,11 +111,11 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       }
     });
 
-    const lifecycleSubscription = this.workflow.lifeCycle.subscribe(event => {
+    const lifecycleSubscription = this.workflow.lifeCycle.subscribe((event) => {
       if (event.kind == 'end' || event.kind == 'post-tasks-start') {
         if (!error) {
           // Output the logging queue, no error happened.
-          logs.forEach(log => this.logger.info(`  ${log}`));
+          logs.forEach((log) => this.logger.info(`  ${log}`));
           logs = [];
         }
       }
@@ -141,12 +138,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       return { success: !error, files };
     } catch (e) {
       if (e instanceof UnsuccessfulWorkflowExecution) {
-        this.logger.error(`${colors.symbols.cross} Migration failed. See above for further details.\n`);
+        this.logger.error(
+          `${colors.symbols.cross} Migration failed. See above for further details.\n`,
+        );
       } else {
         const logPath = writeErrorToLogFile(e);
         this.logger.fatal(
           `${colors.symbols.cross} Migration failed: ${e.message}\n` +
-          `  See "${logPath}" for further details.\n`,
+            `  See "${logPath}" for further details.\n`,
         );
       }
 
@@ -164,7 +163,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     commit?: boolean,
   ): Promise<boolean> {
     const collection = this.workflow.engine.createCollection(collectionPath);
-    const name = collection.listSchematicNames().find(name => name === migrationName);
+    const name = collection.listSchematicNames().find((name) => name === migrationName);
     if (!name) {
       this.logger.error(`Cannot find migration '${migrationName}' in '${packageName}'.`);
 
@@ -213,15 +212,13 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       return true;
     }
 
-    this.logger.info(
-      colors.cyan(`** Executing migrations of package '${packageName}' **\n`),
-    );
+    this.logger.info(colors.cyan(`** Executing migrations of package '${packageName}' **\n`));
 
     return this.executePackageMigrations(migrations, packageName, commit);
   }
 
   private async executePackageMigrations(
-    migrations: Iterable<{ name: string; description: string; collection: { name: string }}>,
+    migrations: Iterable<{ name: string; description: string; collection: { name: string } }>,
     packageName: string,
     commit = false,
   ): Promise<boolean> {
@@ -229,8 +226,9 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       const [title, ...description] = migration.description.split('. ');
 
       this.logger.info(
-        colors.cyan(colors.symbols.pointer) + ' ' +
-        colors.bold(title.endsWith('.') ? title : title + '.'),
+        colors.cyan(colors.symbols.pointer) +
+          ' ' +
+          colors.bold(title.endsWith('.') ? title : title + '.'),
       );
 
       if (description.length) {
@@ -265,47 +263,42 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
   // tslint:disable-next-line:no-big-function
   async run(options: UpdateCommandSchema & Arguments) {
-    // Check if the @angular-devkit/schematics package can be resolved from the workspace root
-    // This works around issues with packages containing migrations that cannot directly depend on the package
-    // This check can be removed once the schematic runtime handles this situation
-    try {
-      require.resolve('@angular-devkit/schematics', { paths: [this.context.root] });
-    } catch (e) {
-      if (e.code === 'MODULE_NOT_FOUND') {
-        this.logger.fatal(
-          'The "@angular-devkit/schematics" package cannot be resolved from the workspace root directory. ' +
-            'This may be due to an unsupported node modules structure.\n' +
-            'Please remove both the "node_modules" directory and the package lock file; and then reinstall.\n' +
-            'If this does not correct the problem, ' +
-            'please temporarily install the "@angular-devkit/schematics" package within the workspace. ' +
-            'It can be removed once the update is complete.',
+    await ensureCompatibleNpm(this.context.root);
+
+    // Check if the current installed CLI version is older than the latest compatible version.
+    if (!disableVersionCheck) {
+      const cliVersionToInstall = await this.checkCLIVersion(
+        options['--'],
+        options.verbose,
+        options.next,
+      );
+
+      if (cliVersionToInstall) {
+        this.logger.warn(
+          'The installed Angular CLI version is outdated.\n' +
+            `Installing a temporary Angular CLI versioned ${cliVersionToInstall} to perform the update.`,
         );
 
-        return 1;
+        return runTempPackageBin(
+          `@angular/cli@${cliVersionToInstall}`,
+          this.logger,
+          this.packageManager,
+          process.argv.slice(2),
+        );
       }
-
-      throw e;
     }
 
-    // Check if the current installed CLI version is older than the latest version.
-    if (!disableVersionCheck && await this.checkCLILatestVersion(options.verbose, options.next)) {
-      this.logger.warn(
-        `The installed local Angular CLI version is older than the latest ${options.next ? 'pre-release' : 'stable'} version.\n` +
-        'Installing a temporary version to perform the update.',
-      );
-
-      return runTempPackageBin(
-        `@angular/cli@${options.next ? 'next' : 'latest'}`,
-        this.logger,
-        this.packageManager,
-        process.argv.slice(2),
-      );
-    }
+    const logVerbose = (message: string) => {
+      if (options.verbose) {
+        this.logger.info(message);
+      }
+    };
 
     if (options.all) {
-      const updateCmd = this.packageManager === PackageManager.Yarn
-        ? `'yarn upgrade-interactive' or 'yarn upgrade'`
-        : `'${this.packageManager} update'`;
+      const updateCmd =
+        this.packageManager === PackageManager.Yarn
+          ? `'yarn upgrade-interactive' or 'yarn upgrade'`
+          : `'${this.packageManager} update'`;
 
       this.logger.warn(`
         '--all' functionality has been removed as updating multiple packages at once is not recommended.
@@ -328,7 +321,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
           return 1;
         }
 
-        if (packages.some(v => v.name === packageIdentifier.name)) {
+        if (packages.some((v) => v.name === packageIdentifier.name)) {
           this.logger.error(`Duplicate package '${packageIdentifier.name}' specified.`);
 
           return 1;
@@ -409,7 +402,9 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
     if (options.migrateOnly) {
       if (!options.from && typeof options.migrateOnly !== 'string') {
-        this.logger.error('"from" option is required when using the "migrate-only" option without a migration name.');
+        this.logger.error(
+          '"from" option is required when using the "migrate-only" option without a migration name.',
+        );
 
         return 1;
       } else if (packages.length !== 1) {
@@ -439,7 +434,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         const packageJson = findPackageJson(this.context.root, packageName);
         if (packageJson) {
           packagePath = path.dirname(packageJson);
-          packageNode = await readPackageJson(packagePath);
+          packageNode = await readPackageJson(packageJson);
         }
       }
 
@@ -472,8 +467,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
       if (migrations.startsWith('../')) {
         this.logger.error(
-          'Package contains an invalid migrations field. ' +
-            'Paths outside the package root are not permitted.',
+          'Package contains an invalid migrations field. Paths outside the package root are not permitted.',
         );
 
         return 1;
@@ -499,9 +493,9 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         }
       }
 
-      let success = false;
+      let result: boolean;
       if (typeof options.migrateOnly == 'string') {
-        success = await this.executeMigration(
+        result = await this.executeMigration(
           packageName,
           migrations,
           options.migrateOnly,
@@ -518,8 +512,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         const migrationRange = new semver.Range(
           '>' + from + ' <=' + (options.to || packageNode.version),
         );
-
-        success = await this.executeMigrations(
+        result = await this.executeMigrations(
           packageName,
           migrations,
           migrationRange,
@@ -527,20 +520,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         );
       }
 
-      if (success) {
-        if (
-          packageName === '@angular/core'
-          && options.from
-          && +options.from.split('.')[0] < 9
-          && (options.to || packageNode.version).split('.')[0] === '9'
-        ) {
-          this.logger.info(NG_VERSION_9_POST_MSG);
-        }
-
-        return 0;
-      }
-
-      return 1;
+      return result ? 0 : 1;
     }
 
     const requests: {
@@ -635,6 +615,35 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         continue;
       }
 
+      if (node.package && ANGULAR_PACKAGES_REGEXP.test(node.package.name)) {
+        const { name, version } = node.package;
+        const toBeInstalledMajorVersion = +manifest.version.split('.')[0];
+        const currentMajorVersion = +version.split('.')[0];
+
+        if (toBeInstalledMajorVersion - currentMajorVersion > 1) {
+          // Only allow updating a single version at a time.
+          if (currentMajorVersion < 6) {
+            // Before version 6, the major versions were not always sequential.
+            // Example @angular/core skipped version 3, @angular/cli skipped versions 2-5.
+            this.logger.error(
+              `Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
+                `For more information about the update process, see https://update.angular.io/.`,
+            );
+          } else {
+            const nextMajorVersionFromCurrent = currentMajorVersion + 1;
+
+            this.logger.error(
+              `Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
+                `Run 'ng update ${name}@${nextMajorVersionFromCurrent}' in your workspace directory ` +
+                `to update to latest '${nextMajorVersionFromCurrent}.x' version of '${name}'.\n\n` +
+                `For more information about the update process, see https://update.angular.io/?v=${currentMajorVersion}.0-${nextMajorVersionFromCurrent}.0`,
+            );
+          }
+
+          return 1;
+        }
+      }
+
       packagesToUpdate.push(requestIdentifier.toString());
     }
 
@@ -653,7 +662,8 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
     if (success && options.createCommits) {
       const committed = this.commit(
-          `Angular CLI update for packages - ${packagesToUpdate.join(', ')}`);
+        `Angular CLI update for packages - ${packagesToUpdate.join(', ')}`,
+      );
       if (!committed) {
         return 1;
       }
@@ -670,11 +680,70 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
     if (success && migrations) {
       for (const migration of migrations) {
+        // Resolve the package from the workspace root, as otherwise it will be resolved from the temp
+        // installed CLI version.
+        let packagePath;
+        logVerbose(
+          `Resolving migration package '${migration.package}' from '${this.context.root}'...`,
+        );
+        try {
+          try {
+            packagePath = path.dirname(
+              // This may fail if the `package.json` is not exported as an entry point
+              require.resolve(path.join(migration.package, 'package.json'), {
+                paths: [this.context.root],
+              }),
+            );
+          } catch (e) {
+            if (e.code === 'MODULE_NOT_FOUND') {
+              // Fallback to trying to resolve the package's main entry point
+              packagePath = require.resolve(migration.package, { paths: [this.context.root] });
+            } else {
+              throw e;
+            }
+          }
+        } catch (e) {
+          if (e.code === 'MODULE_NOT_FOUND') {
+            logVerbose(e.toString());
+            this.logger.error(
+              `Migrations for package (${migration.package}) were not found.` +
+                ' The package could not be found in the workspace.',
+            );
+          } else {
+            this.logger.error(
+              `Unable to resolve migrations for package (${migration.package}).  [${e.message}]`,
+            );
+          }
+
+          return 1;
+        }
+
+        let migrations;
+
+        // Check if it is a package-local location
+        const localMigrations = path.join(packagePath, migration.collection);
+        if (fs.existsSync(localMigrations)) {
+          migrations = localMigrations;
+        } else {
+          // Try to resolve from package location.
+          // This avoids issues with package hoisting.
+          try {
+            migrations = require.resolve(migration.collection, { paths: [packagePath] });
+          } catch (e) {
+            if (e.code === 'MODULE_NOT_FOUND') {
+              this.logger.error(`Migrations for package (${migration.package}) were not found.`);
+            } else {
+              this.logger.error(
+                `Unable to resolve migrations for package (${migration.package}).  [${e.message}]`,
+              );
+            }
+
+            return 1;
+          }
+        }
         const result = await this.executeMigrations(
           migration.package,
-          // Resolve the collection from the workspace root, as otherwise it will be resolved from the temp
-          // installed CLI version.
-          require.resolve(migration.collection, { paths: [this.context.root] }),
+          migrations,
           new semver.Range('>' + migration.from + ' <=' + migration.to),
           options.createCommits,
         );
@@ -683,10 +752,6 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
           return 0;
         }
       }
-
-      if (migrations.some(m => m.package === '@angular/core' && m.to.split('.')[0] === '9' && +m.from.split('.')[0] < 9)) {
-        this.logger.info(NG_VERSION_9_POST_MSG);
-      }
     }
 
     return success ? 0 : 1;
@@ -716,8 +781,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     try {
       createCommit(message);
     } catch (err) {
-      this.logger.error(
-        `Failed to commit update (${message}):\n${err.stderr}`);
+      this.logger.error(`Failed to commit update (${message}):\n${err.stderr}`);
 
       return false;
     }
@@ -726,8 +790,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     const hash = findCurrentGitSha();
     const shortMessage = message.split('\n')[0];
     if (hash) {
-      this.logger.info(`  Committed migration step (${getShortHash(hash)}): ${
-          shortMessage}.`);
+      this.logger.info(`  Committed migration step (${getShortHash(hash)}): ${shortMessage}.`);
     } else {
       // Commit was successful, but reading the hash was not. Something weird happened,
       // but nothing that would stop the update. Just log the weirdness and continue.
@@ -740,7 +803,10 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
 
   private checkCleanGit(): boolean {
     try {
-      const topLevel = execSync('git rev-parse --show-toplevel', { encoding: 'utf8', stdio: 'pipe' });
+      const topLevel = execSync('git rev-parse --show-toplevel', {
+        encoding: 'utf8',
+        stdio: 'pipe',
+      });
       const result = execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
       if (result.trim().length === 0) {
         return true;
@@ -763,14 +829,16 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
   }
 
   /**
-   * Checks if the current installed CLI version is older than the latest version.
-   * @returns `true` when the installed version is older.
-  */
-  private async checkCLILatestVersion(verbose = false, next = false): Promise<boolean> {
-    const { version: installedCLIVersion } = require('../package.json');
-
-    const LatestCLIManifest = await fetchPackageManifest(
-      `@angular/cli@${next ? 'next' : 'latest'}`,
+   * Checks if the current installed CLI version is older or newer than a compatible version.
+   * @returns the version to install or null when there is no update to install.
+   */
+  private async checkCLIVersion(
+    packagesToUpdate: string[] | undefined,
+    verbose = false,
+    next = false,
+  ): Promise<string | null> {
+    const { version } = await fetchPackageManifest(
+      `@angular/cli@${this.getCLIUpdateRunnerVersion(packagesToUpdate, next)}`,
       this.logger,
       {
         verbose,
@@ -778,7 +846,38 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       },
     );
 
-    return semver.lt(installedCLIVersion, LatestCLIManifest.version);
+    return VERSION.full === version ? null : version;
+  }
+
+  private getCLIUpdateRunnerVersion(
+    packagesToUpdate: string[] | undefined,
+    next: boolean,
+  ): string | number {
+    if (next) {
+      return 'next';
+    }
+
+    const updatingAngularPackage = packagesToUpdate?.find((r) => ANGULAR_PACKAGES_REGEXP.test(r));
+    if (updatingAngularPackage) {
+      // If we are updating any Angular package we can update the CLI to the target version because
+      // migrations for @angular/core@13 can be executed using Angular/cli@13.
+      // This is same behaviour as `npx @angular/cli@13 update @angular/core@13`.
+
+      // `@angular/cli@13` -> ['', 'angular/cli', '13']
+      // `@angular/cli` -> ['', 'angular/cli']
+      const tempVersion = coerceVersionNumber(updatingAngularPackage.split('@')[2]);
+
+      return semver.parse(tempVersion)?.major ?? 'latest';
+    }
+
+    // When not updating an Angular package we cannot determine which schematic runtime the migration should to be executed in.
+    // Typically, we can assume that the `@angular/cli` was updated previously.
+    // Example: Angular official packages are typically updated prior to NGRX etc...
+    // Therefore, we only update to the latest patch version of the installed major version of the Angular CLI.
+
+    // This is important because we might end up in a scenario where locally Angular v12 is installed, updating NGRX from 11 to 12.
+    // We end up using Angular ClI v13 to run the migrations if we run the migrations using the CLI installed major version + 1 logic.
+    return VERSION.major;
   }
 }
 
@@ -811,7 +910,7 @@ function createCommit(message: string) {
  */
 function findCurrentGitSha(): string | null {
   try {
-    const hash = execSync('git rev-parse HEAD', {encoding: 'utf8', stdio: 'pipe'});
+    const hash = execSync('git rev-parse HEAD', { encoding: 'utf8', stdio: 'pipe' });
 
     return hash.trim();
   } catch {
diff --git a/packages/angular/cli/commands/update-long.md b/packages/angular/cli/commands/update-long.md
index 93be9c0f3c78..72df66ce35da 100644
--- a/packages/angular/cli/commands/update-long.md
+++ b/packages/angular/cli/commands/update-long.md
@@ -4,14 +4,19 @@ Perform a basic update to the current stable release of the core framework and C
 ng update @angular/cli @angular/core
 ```
 
-To update to the next beta or pre-release version, use the `--next=true` option.
+To update to the next beta or pre-release version, use the `--next` option.
 
 To update from one major version to another, use the format
-`ng update @angular/cli@^<major_version> @angular/core@^<major_version>`.
+
+```
+ng update @angular/cli@^<major_version> @angular/core@^<major_version>
+```
 
 We recommend that you always update to the latest patch version, as it contains fixes we released since the initial major release.
-For example, use the following command to take the latest 9.x.x version and use that to update.
+For example, use the following command to take the latest 10.x.x version and use that to update.
 
-`ng update @angular/cli@^9 @angular/core@^9`
+```
+ng update @angular/cli@^10 @angular/core@^10
+```
 
 For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 0d1205c86078..b87e75a35fbb 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -44,7 +44,7 @@
           "type": "boolean"
         },
         "migrateOnly": {
-          "description": "Only perform a migration, does not update the installed version.",
+          "description": "Only perform a migration, do not update the installed version.",
           "oneOf": [
             {
               "type": "boolean"
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 669ce2d2ba54..70a8fc6faa27 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -1,15 +1,14 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, parseJson } from '@angular-devkit/core';
-import * as fs from 'fs';
 import * as path from 'path';
 import { Command } from '../models/command';
 import { colors } from '../utilities/color';
+import { JSONFile } from '../utilities/json-file';
 import { Schema as VersionCommandSchema } from './version';
 
 interface PartialPackageInfo {
@@ -169,15 +168,9 @@ export class VersionCommand extends Command<VersionCommandSchema> {
 
   private getIvyWorkspace(): string {
     try {
-      const content = fs.readFileSync(path.resolve(this.context.root, 'tsconfig.json'), 'utf-8');
-      const tsConfig = parseJson(content, JsonParseMode.Loose);
-      if (!isJsonObject(tsConfig)) {
-        return '<error>';
-      }
-
-      const { angularCompilerOptions } = tsConfig;
+      const json = new JSONFile(path.resolve(this.context.root, 'tsconfig.json'));
 
-      return isJsonObject(angularCompilerOptions) && angularCompilerOptions.enableIvy === false
+      return json.get(['angularCompilerOptions', 'enableIvy']) === false
         ? 'No'
         : 'Yes';
     } catch {
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index d7e3d913260a..d9878d04fa21 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index c8e163d12103..72ed61fb4ba3 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -64,6 +64,20 @@
         "analytics": {
           "type": ["boolean", "string"],
           "description": "Share anonymous usage data with the Angular Team at Google."
+        },
+        "analyticsSharing": {
+          "type": "object",
+          "properties": {
+            "tracking": {
+              "description": "Analytics sharing info tracking ID.",
+              "type": "string",
+              "pattern": "^GA-\\d+-\\d+$"
+            },
+            "uuid": {
+              "description": "Analytics sharing info universally unique identifier.",
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": false
@@ -155,7 +169,7 @@
             },
             "skipTests": {
               "type": "boolean",
-              "description": "When true, does not create test files.",
+              "description": "Do not create test files.",
               "default": false
             }
           }
@@ -197,7 +211,7 @@
             },
             "skipTests": {
               "type": "boolean",
-              "description": "When true, does not create test files.",
+              "description": "Do not create test files.",
               "default": false
             }
           }
@@ -244,7 +258,7 @@
             },
             "skipTests": {
               "type": "boolean",
-              "description": "When true, does not create test files.",
+              "description": "Do not create test files.",
               "default": false
             }
           }
@@ -259,7 +273,7 @@
             },
             "skipTests": {
               "type": "boolean",
-              "description": "When true, does not create test files.",
+              "description": "Do not create test files.",
               "default": false
             },
             "skipImport": {
@@ -285,7 +299,7 @@
           "properties": {
             "skipTests": {
               "type": "boolean",
-              "description": "When true, does not create test files.",
+              "description": "Do not create test files.",
               "default": false
             }
           }
@@ -478,7 +492,8 @@
                       "@angular-devkit/build-angular:karma",
                       "@angular-devkit/build-angular:protractor",
                       "@angular-devkit/build-angular:server",
-                      "@angular-devkit/build-angular:tslint"
+                      "@angular-devkit/build-angular:tslint",
+                      "@angular-devkit/build-angular:ng-packagr"
                     ]
                   }
                 },
@@ -584,6 +599,17 @@
                   "additionalProperties": { "$ref": "#/definitions/targetOptions/definitions/tslint" }
                 }
               }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builder": { "const": "@angular-devkit/build-angular:ng-packagr" },
+                "options": { "$ref": "#/definitions/targetOptions/definitions/ngPackagr" },
+                "configurations": {
+                  "type": "object",
+                  "additionalProperties": { "$ref": "#/definitions/targetOptions/definitions/ngPackagr" }
+                }
+              }
             }
           ]
         }
@@ -619,11 +645,11 @@
           "properties": {
             "browserTarget": {
               "type": "string",
-              "description": "Target to build."
+              "description": "A browser builder target to use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`."
             },
             "serverTarget": {
               "type": "string",
-              "description": "Server target to use for rendering the app shell."
+              "description": "A server builder target to use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`."
             },
             "appModuleBundle": {
               "type": "string",
@@ -701,7 +727,7 @@
               "additionalProperties": false
             },
             "optimization": {
-              "description": "Enables optimization of the build output.",
+              "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
               "oneOf": [
                 {
                   "type": "object",
@@ -712,12 +738,32 @@
                       "default": true
                     },
                     "styles": {
-                      "type": "boolean",
                       "description": "Enables optimization of the styles output.",
-                      "default": true
+                      "default": true,
+                      "oneOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "minify": {
+                              "type": "boolean",
+                              "description": "Minify CSS definitions by removing extraneous whitespace and comments, merging identifiers and minimizing values.",
+                              "default": true
+                            },
+                            "inlineCritical": {
+                              "type": "boolean",
+                              "description": "Extract and inline critical CSS definitions to improve first paint time.",
+                              "default": false
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "boolean"
+                        }
+                      ]
                     },
                     "fonts": {
-                      "description": "Enables optimization for fonts. This requires internet access.",
+                      "description": "Enables optimization for fonts. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
                       "default": true,
                       "oneOf": [
                         {
@@ -725,7 +771,7 @@
                           "properties": {
                             "inline": {
                               "type": "boolean",
-                              "description": "Reduce render blocking requests by inlining external fonts in the application's HTML index file. This requires internet access.",
+                              "description": "Reduce render blocking requests by inlining external Google fonts and icons CSS definitions in the application's HTML index file. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
                               "default": true
                             }
                           },
@@ -766,7 +812,7 @@
               "default": false
             },
             "sourceMap": {
-              "description": "Output sourcemaps.",
+              "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
               "default": true,
               "oneOf": [
                 {
@@ -774,22 +820,22 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all scripts.",
+                      "description": "Output source maps for all scripts.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all styles.",
+                      "description": "Output source maps for all styles.",
                       "default": true
                     },
                     "hidden": {
                       "type": "boolean",
-                      "description": "Output sourcemaps used for error reporting tools.",
+                      "description": "Output source maps used for error reporting tools.",
                       "default": false
                     },
                     "vendor": {
                       "type": "boolean",
-                      "description": "Resolve vendor packages sourcemaps.",
+                      "description": "Resolve vendor packages source maps.",
                       "default": false
                     }
                   },
@@ -802,12 +848,12 @@
             },
             "vendorChunk": {
               "type": "boolean",
-              "description": "Use a separate bundle containing only vendor libraries.",
+              "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
               "default": true
             },
             "commonChunk": {
               "type": "boolean",
-              "description": "Use a separate bundle containing code used across multiple bundles.",
+              "description": "Generate a seperate bundle containing code used across multiple bundles.",
               "default": true
             },
             "baseHref": {
@@ -955,7 +1001,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"
@@ -970,12 +1016,6 @@
               },
               "default": []
             },
-            "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
-            },
             "webWorkerTsConfig": {
               "type": "string",
               "description": "TypeScript configuration for Web Worker modules."
@@ -1010,6 +1050,11 @@
                 {
                   "type": "object",
                   "properties": {
+                    "followSymlinks": {
+                      "type": "boolean",
+                      "default": false,
+                      "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+                    },
                     "glob": {
                       "type": "string",
                       "description": "The pattern to match."
@@ -1049,10 +1094,12 @@
                   "type": "object",
                   "properties": {
                     "src": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     },
                     "replaceWith": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     }
                   },
                   "additionalProperties": false,
@@ -1065,10 +1112,12 @@
                   "type": "object",
                   "properties": {
                     "replace": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     },
                     "with": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     }
                   },
                   "additionalProperties": false,
@@ -1171,7 +1220,7 @@
           "properties": {
             "browserTarget": {
               "type": "string",
-              "description": "Target to serve."
+              "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`."
             },
             "port": {
               "type": "number",
@@ -1212,13 +1261,13 @@
             },
             "open": {
               "type": "boolean",
-              "description": "When true, open the live-reload URL in default browser.",
+              "description": "Open the live-reload URL in default browser.",
               "default": false,
               "alias": "o"
             },
             "liveReload": {
               "type": "boolean",
-              "description": "When true, reload the page on change using live-reload.",
+              "description": "Reload the page on change using live-reload.",
               "default": true
             },
             "publicHost": {
@@ -1239,31 +1288,31 @@
             },
             "disableHostCheck": {
               "type": "boolean",
-              "description": "When true, don't verify that connected clients are part of allowed hosts.",
+              "description": "Do not verify that connected clients are part of allowed hosts.",
               "default": false
             },
             "hmr": {
               "type": "boolean",
-              "description": "When true, enable hot module replacement.",
+              "description": "Enable hot module replacement.",
               "default": false
             },
             "watch": {
               "type": "boolean",
-              "description": "When true, rebuild on change.",
+              "description": "Rebuild on change.",
               "default": true
             },
             "hmrWarning": {
               "type": "boolean",
-              "description": "When true, show a warning when the --hmr option is enabled.",
+              "description": "Show a warning when the --hmr option is enabled.",
               "default": true
             },
             "servePathDefaultWarning": {
               "type": "boolean",
-              "description": "When true, show a warning when deploy-url/base-href use unsupported serve path values.",
+              "description": "Show a warning when deploy-url/base-href use unsupported serve path values.",
               "default": true
             },
             "optimization": {
-              "description": "Enable optimization of the build output.",
+              "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
               "default": false,
               "oneOf": [
                 {
@@ -1271,12 +1320,12 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "When true, enable optimization of the scripts output.",
+                      "description": "Enable optimization of the scripts output.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "When true, enable optimization of the styles output.",
+                      "description": "Enable optimization of the styles output.",
                       "default": true
                     }
                   },
@@ -1292,7 +1341,7 @@
               "description": "Build using ahead-of-time compilation."
             },
             "sourceMap": {
-              "description": "When true, output sourcemaps.",
+              "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
               "default": true,
               "oneOf": [
                 {
@@ -1300,17 +1349,17 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "When true, output sourcemaps for all scripts.",
+                      "description": "Output source maps for all scripts.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "When true, output sourcemaps for all styles.",
+                      "description": "Output source maps for all styles.",
                       "default": true
                     },
                     "vendor": {
                       "type": "boolean",
-                      "description": "When true, resolve vendor packages sourcemaps.",
+                      "description": "Resolve vendor packages source maps.",
                       "default": false
                     }
                   },
@@ -1323,11 +1372,11 @@
             },
             "vendorChunk": {
               "type": "boolean",
-              "description": "When true, use a separate bundle containing only vendor libraries."
+              "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development."
             },
             "commonChunk": {
               "type": "boolean",
-              "description": "When true, use a separate bundle containing code used across multiple bundles."
+              "description": "Generate a seperate bundle containing code used across multiple bundles."
             },
             "baseHref": {
               "type": "string",
@@ -1339,11 +1388,11 @@
             },
             "verbose": {
               "type": "boolean",
-              "description": "When true, add more details to output logging."
+              "description": "Add more details to output logging."
             },
             "progress": {
               "type": "boolean",
-              "description": "When true, log progress to the console while building."
+              "description": "Log progress to the console while building."
             }
           },
           "additionalProperties": false
@@ -1354,7 +1403,7 @@
           "properties": {
             "browserTarget": {
               "type": "string",
-              "description": "Target to extract from."
+              "description": "A browser builder target to extract i18n messages in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`."
             },
             "format": {
               "type": "string",
@@ -1366,7 +1415,9 @@
                 "xlif",
                 "xliff",
                 "xlf2",
-                "xliff2"
+                "xliff2",
+                "json",
+                "arb"
               ]
             },
             "i18nFormat": {
@@ -1380,7 +1431,9 @@
                 "xlif",
                 "xliff",
                 "xlf2",
-                "xliff2"
+                "xliff2",
+                "json",
+                "arb"
               ]
             },
             "i18nLocale": {
@@ -1468,7 +1521,7 @@
               "additionalProperties": false
             },
             "sourceMap": {
-              "description": "Output sourcemaps.",
+              "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
               "default": true,
               "oneOf": [
                 {
@@ -1476,17 +1529,17 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all scripts.",
+                      "description": "Output source maps for all scripts.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all styles.",
+                      "description": "Output source maps for all styles.",
                       "default": true
                     },
                     "vendor": {
                       "type": "boolean",
-                      "description": "Resolve vendor packages sourcemaps.",
+                      "description": "Resolve vendor packages source maps.",
                       "default": false
                     }
                   },
@@ -1592,6 +1645,11 @@
                 {
                   "type": "object",
                   "properties": {
+                    "followSymlinks": {
+                      "type": "boolean",
+                      "default": false,
+                      "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+                    },
                     "glob": {
                       "type": "string",
                       "description": "The pattern to match."
@@ -1667,7 +1725,7 @@
             },
             "devServerTarget": {
               "type": "string",
-              "description": "Dev server target to run tests against."
+              "description": "A dev-server builder target to run tests against in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`."
             },
             "grep": {
               "type": "string",
@@ -1745,7 +1803,7 @@
               "additionalProperties": false
             },
             "optimization": {
-              "description": "Enables optimization of the build output.",
+              "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
               "default": false,
               "oneOf": [
                 {
@@ -1786,7 +1844,7 @@
               "description": "The path where style resources will be placed, relative to outputPath."
             },
             "sourceMap": {
-              "description": "Output sourcemaps.",
+              "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
               "default": true,
               "oneOf": [
                 {
@@ -1794,22 +1852,22 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all scripts.",
+                      "description": "Output source maps for all scripts.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all styles.",
+                      "description": "Output source maps for all styles.",
                       "default": true
                     },
                     "hidden": {
                       "type": "boolean",
-                      "description": "Output sourcemaps used for error reporting tools.",
+                      "description": "Output source maps used for error reporting tools.",
                       "default": false
                     },
                     "vendor": {
                       "type": "boolean",
-                      "description": "Resolve vendor packages sourcemaps.",
+                      "description": "Resolve vendor packages source maps.",
                       "default": false
                     }
                   },
@@ -1937,10 +1995,12 @@
                   "type": "object",
                   "properties": {
                     "src": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     },
                     "replaceWith": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     }
                   },
                   "additionalProperties": false,
@@ -1953,10 +2013,12 @@
                   "type": "object",
                   "properties": {
                     "replace": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     },
                     "with": {
-                      "type": "string"
+                      "type": "string",
+                      "pattern": "\\.(([cm]?j|t)sx?|json)$"
                     }
                   },
                   "additionalProperties": false,
@@ -2051,6 +2113,26 @@
             }
           },
           "additionalProperties": false
+        },
+        "ngPackagr": {
+          "description": "ng-packagr target options for Build Architect. Use to build library projects.",
+          "type": "object",
+          "properties": {
+            "project": {
+              "type": "string",
+              "description": "The file path for the ng-packagr configuration file, relative to the current workspace."
+            },
+            "tsConfig": {
+              "type": "string",
+              "description": "The full path for the TypeScript configuration file, relative to the current workspace."
+            },
+            "watch": {
+              "type": "boolean",
+              "description": "Run build when files change.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
         }
       }
     },
@@ -2062,6 +2144,7 @@
         "default": "warning"
       },
       "localize": {
+        "description": "Translate the bundles in one or more locales.",
         "oneOf": [
           {
             "type": "boolean",
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index 2740fa69bf43..7a67dabea1c8 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -81,33 +81,41 @@ if (process.env['NG_CLI_PROFILING']) {
     const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
     cli = await import(projectLocalCli);
 
-    // This was run from a global, check local version.
-    if (await isWarningEnabled('versionMismatch')) {
-      const globalVersion = new SemVer(require('../package.json').version);
-
-      // Older versions might not have the VERSION export
-      let localVersion = cli.VERSION?.full;
-      if (!localVersion) {
-        try {
-          localVersion = require(path.join(path.dirname(projectLocalCli), '../../package.json'))
-            .version;
-        } catch (error) {
-          // tslint:disable-next-line no-console
-          console.error(
-            'Version mismatch check skipped. Unable to retrieve local version: ' + error,
-          );
-        }
-      }
+    const globalVersion = new SemVer(require('../package.json').version);
 
-      let shouldWarn = false;
+    // Older versions might not have the VERSION export
+    let localVersion = cli.VERSION?.full;
+    if (!localVersion) {
       try {
-        shouldWarn = !!localVersion && globalVersion.compare(localVersion) > 0;
+        localVersion = require(path.join(path.dirname(projectLocalCli), '../../package.json'))
+          .version;
       } catch (error) {
         // tslint:disable-next-line no-console
-        console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
+        console.error(
+          'Version mismatch check skipped. Unable to retrieve local version: ' + error,
+        );
       }
+    }
+
+    let isGlobalGreater = false;
+    try {
+      isGlobalGreater = !!localVersion && globalVersion.compare(localVersion) > 0;
+    } catch (error) {
+      // tslint:disable-next-line no-console
+      console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
+    }
 
-      if (shouldWarn) {
+    if (isGlobalGreater) {
+      // If using the update command and the global version is greater, use the newer update command
+      // This allows improvements in update to be used in older versions that do not have bootstrapping
+      if (
+        process.argv[2] === 'update' &&
+        cli.VERSION &&
+        cli.VERSION.major - globalVersion.major <= 1
+      ) {
+        cli = await import('./cli');
+      } else if (await isWarningEnabled('versionMismatch')) {
+        // Otherwise, use local version and warn if global is newer than local
         const warning =
           `Your global Angular CLI version (${globalVersion}) is greater than your local ` +
           `version (${localVersion}). The local Angular CLI version is used.\n\n` +
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 1118c2311b8d..76474dfc60a6 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,7 +8,6 @@
 import { analytics, json, tags } 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';
@@ -357,21 +356,21 @@ export function setAnalyticsConfig(level: 'global' | 'local', value: string | bo
     throw new Error(`Could not find ${level} workspace.`);
   }
 
-  const configValue = config.value;
-  const cli: json.JsonValue = configValue['cli'] || (configValue['cli'] = {});
+  const cli = config.get(['cli']);
 
-  if (!json.isJsonObject(cli)) {
+  if (cli !== undefined && !json.isJsonObject(cli as json.JsonValue)) {
     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);
+  config.modify(['cli', 'analytics'], value);
+  config.save();
+
   analyticsDebug('done');
+
 }
 
 /**
@@ -389,7 +388,7 @@ export async function promptGlobalAnalytics(force = false) {
         message: tags.stripIndents`
           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.
+          how to change this setting, see https://angular.io/analytics.
         `,
         default: false,
       },
@@ -447,7 +446,7 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
         message: tags.stripIndents`
           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.
+          details and how to change this setting, see https://angular.io/analytics.
 
         `,
         default: false,
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index c9a9573dd711..57f8a9a88dd9 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index b8ec88e57883..3fecd24d7639 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -1,12 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
   analytics,
   isJsonObject,
   json,
@@ -18,6 +17,7 @@ import {
 import { readFileSync } from 'fs';
 import { join, resolve } from 'path';
 import { AngularWorkspace } from '../utilities/config';
+import { readAndParseJson } from '../utilities/json-file';
 import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
 import {
   getGlobalAnalytics,
@@ -39,6 +39,7 @@ const standardCommands = {
   'config': '../commands/config.json',
   'doc': '../commands/doc.json',
   'e2e': '../commands/e2e.json',
+  'extract-i18n': '../commands/extract-i18n.json',
   'make-this-awesome': '../commands/easter-egg.json',
   'generate': '../commands/generate.json',
   'help': '../commands/help.json',
@@ -49,7 +50,6 @@ const standardCommands = {
   'test': '../commands/test.json',
   'update': '../commands/update.json',
   'version': '../commands/version.json',
-  'xi18n': '../commands/xi18n.json',
 };
 
 export interface CommandMapOptions {
@@ -97,8 +97,7 @@ async function loadCommandDescription(
   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 });
+  const schema = readAndParseJson(schemaPath);
   if (!isJsonObject(schema)) {
     throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
   }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 4f7eac9fb837..eec0c3eec802 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -54,7 +54,10 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   }
 
   async printJsonHelp(_options: T & Arguments): Promise<number> {
-    this.logger.info(JSON.stringify(this.description));
+    const replacer = (key: string, value: string) => key === 'name'
+      ? strings.dasherize(value)
+      : value;
+    this.logger.info(JSON.stringify(this.description, replacer, 2));
 
     return 0;
   }
@@ -160,7 +163,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     this.analytics.pageview('/command/' + paths.join('/'), { dimensions, metrics });
   }
 
-  abstract async run(options: T & Arguments): Promise<number | void>;
+  abstract run(options: T & Arguments): Promise<number | void>;
 
   async validateAndRun(options: T & Arguments): Promise<number | void> {
     if (!(options.help === true || options.help === 'json' || options.help === 'JSON')) {
diff --git a/packages/angular/cli/models/error.ts b/packages/angular/cli/models/error.ts
index 5d9d323ed103..dacdd2f3a38d 100644
--- a/packages/angular/cli/models/error.ts
+++ b/packages/angular/cli/models/error.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 338b6310bce5..f5b3ee4de60e 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -153,6 +153,12 @@ export interface Option {
    * If this is falsey, do not report this option.
    */
   userAnalytics?: 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;
 }
 
 /**
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index e09405132a33..951e35b1dadd 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -1,10 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, strings } from '@angular-devkit/core';
 import { Arguments, Option, OptionType, Value } from './interface';
@@ -211,6 +210,13 @@ function _assignOption(
       errors.push(error);
       ignored.push(arg);
     }
+
+    if (/^[a-z]+[A-Z]/.test(key)) {
+      warnings.push(
+        'Support for camel case arguments has been deprecated and will be removed in a future major version.\n' +
+        `Use '--${strings.dasherize(key)}' instead of '--${key}'.`,
+      );
+    }
   }
 
   return consumedNextArg;
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index cd6b3c09e801..152cdb36fe58 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -1,10 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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-big-function
 import { logging } from '@angular-devkit/core';
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 92f87ad0075b..f67024eb7761 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -1,12 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
   normalize,
   schema,
@@ -24,25 +23,20 @@ import {
   FileSystemCollection,
   FileSystemEngine,
   FileSystemSchematic,
-  FileSystemSchematicDescription,
   NodeWorkflow,
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
 import { colors } from '../utilities/color';
-import {
-  getProjectByCwd,
-  getSchematicDefaults,
-  getWorkspace,
-  getWorkspaceRaw,
-} from '../utilities/config';
+import { getProjectByCwd, getSchematicDefaults, getWorkspace } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
-import { getPackageManager } from '../utilities/package-manager';
+import { ensureCompatibleNpm, 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';
 import { parseArguments, parseFreeFormArguments } from './parser';
+import { SchematicEngineHost } from './schematic-engine-host';
 
 export interface BaseSchematicSchema {
   debug?: boolean;
@@ -257,6 +251,14 @@ export abstract class SchematicCommand<
         // Global
         : [__dirname, process.cwd()],
       schemaValidation: true,
+      optionTransforms: [
+        // Add configuration file defaults
+        async (schematic, current) => ({
+          ...(await getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName())),
+          ...current,
+        }),
+      ],
+      engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),
     });
 
     const getProjectName = () => {
@@ -284,16 +286,6 @@ export abstract class SchematicCommand<
       return undefined;
     };
 
-    const defaultOptionTransform = async (
-      schematic: FileSystemSchematicDescription,
-      current: {},
-    ) => ({
-      ...(await getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName())),
-      ...current,
-    });
-
-    workflow.engineHost.registerOptionsTransform(defaultOptionTransform);
-
     workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
     workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
     workflow.registry.useXDeprecatedProvider(msg => this.logger.warn(msg));
@@ -322,6 +314,32 @@ export abstract class SchematicCommand<
             const validator = definition.validator;
             if (validator) {
               question.validate = input => validator(input);
+
+              // Filter allows transformation of the value prior to validation
+              question.filter = async (input) => {
+                for (const type of definition.propertyTypes) {
+                  let value;
+                  switch (type) {
+                    case 'string':
+                      value = String(input);
+                      break;
+                    case 'integer':
+                    case 'number':
+                      value = Number(input);
+                      break;
+                    default:
+                      value = input;
+                      break;
+                  }
+                  // Can be a string if validation fails
+                  const isValid = (await validator(value)) === true;
+                  if (isValid) {
+                    return value;
+                  }
+                }
+
+                return input;
+              };
             }
 
             switch (definition.type) {
@@ -407,43 +425,6 @@ export abstract class SchematicCommand<
     collectionName = schematic.collection.description.name;
     schematicName = schematic.description.name;
 
-    // TODO: Remove warning check when 'targets' is default
-    if (collectionName !== this.defaultCollectionName) {
-      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;
@@ -522,6 +503,16 @@ export abstract class SchematicCommand<
       }
     });
 
+    // Temporary compatibility check for NPM 7
+    if (collectionName === '@schematics/angular' && schematicName === 'ng-new') {
+      if (
+        !input.skipInstall &&
+        (input.packageManager === undefined || input.packageManager === 'npm')
+      ) {
+        await ensureCompatibleNpm(this.context.root);
+      }
+    }
+
     return new Promise<number | void>(resolve => {
       workflow
         .execute({
@@ -539,7 +530,7 @@ export abstract class SchematicCommand<
               // "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}`);
+              this.logger.fatal(`An error occurred:\n${err.message}\n${err.stack}`);
             } else {
               this.logger.fatal(err.message);
             }
diff --git a/packages/angular/cli/models/schematic-engine-host.ts b/packages/angular/cli/models/schematic-engine-host.ts
new file mode 100644
index 000000000000..df3482e5adf7
--- /dev/null
+++ b/packages/angular/cli/models/schematic-engine-host.ts
@@ -0,0 +1,189 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { RuleFactory, SchematicsException, Tree } from '@angular-devkit/schematics';
+import { NodeModulesEngineHost } from '@angular-devkit/schematics/tools';
+import { readFileSync } from 'fs';
+import { parse as parseJson } from 'jsonc-parser';
+import { dirname, resolve } from 'path';
+import { Script } from 'vm';
+
+/**
+ * Environment variable to control schematic package redirection
+ * Default: Angular schematics only
+ */
+const schematicRedirectVariable = process.env['NG_SCHEMATIC_REDIRECT']?.toLowerCase();
+
+function shouldWrapSchematic(schematicFile: string): boolean {
+  // Check environment variable if present
+  if (schematicRedirectVariable !== undefined) {
+    switch (schematicRedirectVariable) {
+      case '0':
+      case 'false':
+      case 'off':
+      case 'none':
+        return false;
+      case 'all':
+        return true;
+    }
+  }
+
+  // Never wrap `@schematics/update` when executed directly
+  // It communicates with the update command via `global`
+  if (/[\/\\]node_modules[\/\\]@schematics[\/\\]update[\/\\]/.test(schematicFile)) {
+    return false;
+  }
+
+  // Default is only first-party Angular schematic packages
+  // Angular schematics are safe to use in the wrapped VM context
+  return /[\/\\]node_modules[\/\\]@(?:angular|schematics|nguniversal)[\/\\]/.test(schematicFile);
+}
+
+export class SchematicEngineHost extends NodeModulesEngineHost {
+  protected _resolveReferenceString(refString: string, parentPath: string) {
+    const [path, name] = refString.split('#', 2);
+    // Mimic behavior of ExportStringRef class used in default behavior
+    const fullPath = path[0] === '.' ? resolve(parentPath ?? process.cwd(), path) : path;
+
+    const schematicFile = require.resolve(fullPath, { paths: [parentPath] });
+
+    if (shouldWrapSchematic(schematicFile)) {
+      const schematicPath = dirname(schematicFile);
+
+      const moduleCache = new Map<string, unknown>();
+      const factoryInitializer = wrap(
+        schematicFile,
+        schematicPath,
+        moduleCache,
+        name || 'default',
+      ) as () => RuleFactory<{}>;
+
+      const factory = factoryInitializer();
+      if (!factory || typeof factory !== 'function') {
+        return null;
+      }
+
+      return { ref: factory, path: schematicPath };
+    }
+
+    // All other schematics use default behavior
+    return super._resolveReferenceString(refString, parentPath);
+  }
+}
+
+/**
+ * Minimal shim modules for legacy deep imports of `@schematics/angular`
+ */
+const legacyModules: Record<string, unknown> = {
+  '@schematics/angular/utility/config': {
+    getWorkspace(host: Tree) {
+      const path = '/.angular.json';
+      const data = host.read(path);
+      if (!data) {
+        throw new SchematicsException(`Could not find (${path})`);
+      }
+
+      return parseJson(data.toString(), [], { allowTrailingComma: true });
+    },
+  },
+  '@schematics/angular/utility/project': {
+    buildDefaultPath(project: { sourceRoot?: string; root: string; projectType: string }): string {
+      const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;
+
+      return `${root}${project.projectType === 'application' ? 'app' : 'lib'}`;
+    },
+  },
+};
+
+/**
+ * Wrap a JavaScript file in a VM context to allow specific Angular dependencies to be redirected.
+ * This VM setup is ONLY intended to redirect dependencies.
+ *
+ * @param schematicFile A JavaScript schematic file path that should be wrapped.
+ * @param schematicDirectory A directory that will be used as the location of the JavaScript file.
+ * @param moduleCache A map to use for caching repeat module usage and proper `instanceof` support.
+ * @param exportName An optional name of a specific export to return. Otherwise, return all exports.
+ */
+function wrap(
+  schematicFile: string,
+  schematicDirectory: string,
+  moduleCache: Map<string, unknown>,
+  exportName?: string,
+): () => unknown {
+  const { createRequire, createRequireFromPath } = require('module');
+  // Node.js 10.x does not support `createRequire` so fallback to `createRequireFromPath`
+  // `createRequireFromPath` is deprecated in 12+ and can be removed once 10.x support is removed
+  const scopedRequire = createRequire?.(schematicFile) || createRequireFromPath(schematicFile);
+
+  const customRequire = function (id: string) {
+    if (legacyModules[id]) {
+      // Provide compatibility modules for older versions of @angular/cdk
+      return legacyModules[id];
+    } else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
+      // Resolve from inside the `@angular/cli` project
+      const packagePath = require.resolve(id);
+
+      return require(packagePath);
+    } else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {
+      // Wrap relative files inside the schematic collection
+      // Also wrap `@angular/cdk`, it contains helper utilities that import core schematic packages
+
+      // Resolve from the original file
+      const modulePath = scopedRequire.resolve(id);
+
+      // Use cached module if available
+      const cachedModule = moduleCache.get(modulePath);
+      if (cachedModule) {
+        return cachedModule;
+      }
+
+      // Do not wrap vendored third-party packages or JSON files
+      if (
+        !/[\/\\]node_modules[\/\\]@schematics[\/\\]angular[\/\\]third_party[\/\\]/.test(
+          modulePath,
+        ) &&
+        !modulePath.endsWith('.json')
+      ) {
+        // Wrap module and save in cache
+        const wrappedModule = wrap(modulePath, dirname(modulePath), moduleCache)();
+        moduleCache.set(modulePath, wrappedModule);
+
+        return wrappedModule;
+      }
+    }
+
+    // All others are required directly from the original file
+    return scopedRequire(id);
+  };
+
+  // Setup a wrapper function to capture the module's exports
+  const schematicCode = readFileSync(schematicFile, 'utf8');
+  // `module` is required due to @angular/localize ng-add being in UMD format
+  const headerCode = '(function() {\nvar exports = {};\nvar module = { exports };\n';
+  const footerCode = exportName ? `\nreturn exports['${exportName}'];});` : '\nreturn exports;});';
+
+  const script = new Script(headerCode + schematicCode + footerCode, {
+    filename: schematicFile,
+    lineOffset: 3,
+  });
+
+  const context = {
+    __dirname: schematicDirectory,
+    __filename: schematicFile,
+    Buffer,
+    console,
+    process,
+    get global() {
+      return this;
+    },
+    require: customRequire,
+  };
+
+  const exportsFactory = script.runInNewContext(context);
+
+  return exportsFactory;
+}
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 35b97a5fc985..4953c40e409d 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -32,26 +32,28 @@
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
-    "debug": "4.2.0",
-    "ini": "1.3.5",
+    "debug": "4.3.1",
+    "ini": "2.0.0",
     "inquirer": "7.3.3",
+    "jsonc-parser": "3.0.0",
     "npm-package-arg": "8.1.0",
     "npm-pick-manifest": "6.1.0",
-    "open": "7.3.0",
-    "pacote": "9.5.12",
-    "resolve": "1.17.0",
+    "open": "7.4.0",
+    "ora": "5.3.0",
+    "pacote": "11.2.4",
+    "resolve": "1.19.0",
     "rimraf": "3.0.2",
-    "semver": "7.3.2",
-    "symbol-observable": "2.0.3",
+    "semver": "7.3.4",
+    "symbol-observable": "3.0.0",
     "universal-analytics": "0.4.23",
-    "uuid": "8.3.1"
+    "uuid": "8.3.2"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
       "@angular/cli": "0.0.0",
+      "@angular-devkit/architect": "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",
       "@angular-devkit/core": "0.0.0",
       "@angular-devkit/schematics": "0.0.0"
diff --git a/packages/angular/cli/utilities/color.ts b/packages/angular/cli/utilities/color.ts
index 6e7d11cb7fe2..c729fa6a5811 100644
--- a/packages/angular/cli/utilities/color.ts
+++ b/packages/angular/cli/utilities/color.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index 029aaa156858..9bbef68eeee6 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -1,30 +1,46 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
-  JsonObject,
-  JsonParseMode,
-  json,
-  parseJson,
-  parseJsonAst,
-  workspaces,
-} from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { json, workspaces } from '@angular-devkit/core';
+import { existsSync, readFileSync, statSync, writeFileSync } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { findUp } from './find-up';
+import { JSONFile, readAndParseJson } from './json-file';
 
 function isJsonObject(value: json.JsonValue | undefined): value is json.JsonObject {
   return value !== undefined && json.isJsonObject(value);
 }
 
+function createWorkspaceHost(): workspaces.WorkspaceHost {
+  return {
+    async readFile(path) {
+      return readFileSync(path, 'utf-8');
+    },
+    async writeFile(path, data) {
+      writeFileSync(path, data);
+    },
+    async isDirectory(path) {
+      try {
+        return statSync(path).isDirectory();
+      } catch {
+        return false;
+      }
+    },
+    async isFile(path) {
+      try {
+        return statSync(path).isFile();
+      } catch {
+        return false;
+      }
+    },
+  };
+}
+
 function getSchemaLocation(): string {
   return path.join(__dirname, '../lib/config/schema.json');
 }
@@ -116,7 +132,7 @@ export class AngularWorkspace {
 
     const result = await workspaces.readWorkspace(
       workspaceFilePath,
-      workspaces.createWorkspaceHost(new NodeJsSyncHost()),
+      createWorkspaceHost(),
       workspaces.WorkspaceFormat.JSON,
     );
 
@@ -143,13 +159,7 @@ export async function getWorkspace(
   }
 
   try {
-    const result = await workspaces.readWorkspace(
-      configPath,
-      workspaces.createWorkspaceHost(new NodeJsSyncHost()),
-      workspaces.WorkspaceFormat.JSON,
-    );
-
-    const workspace = new AngularWorkspace(result.workspace, configPath);
+    const workspace = await AngularWorkspace.load(configPath);
     cachedWorkspaces.set(level, workspace);
 
     return workspace;
@@ -175,7 +185,7 @@ export function createGlobalSettings(): string {
 
 export function getWorkspaceRaw(
   level: 'local' | 'global' = 'local',
-): [JsonAstObject | null, string | null] {
+): [JSONFile | null, string | null] {
   let configPath = level === 'local' ? projectFilePath() : globalFilePath();
 
   if (!configPath) {
@@ -186,28 +196,11 @@ export function getWorkspaceRaw(
     }
   }
 
-  const data = readFileSync(configPath);
-  let start = 0;
-  if (data.length > 3 && data[0] === 0xef && data[1] === 0xbb && data[2] === 0xbf) {
-    // Remove BOM
-    start = 3;
-  }
-  const content = data.toString('utf-8', start);
-  const ast = parseJsonAst(content, JsonParseMode.Loose);
-
-  if (ast.kind != 'object') {
-    throw new Error(`Invalid JSON file: ${configPath}`);
-  }
-
-  return [ast, configPath];
+  return [new JSONFile(configPath), configPath];
 }
 
-export async function validateWorkspace(data: JsonObject): Promise<void> {
-  const schemaContent = readFileSync(
-    path.join(__dirname, '..', 'lib', 'config', 'schema.json'),
-    'utf-8',
-  );
-  const schema = parseJson(schemaContent, JsonParseMode.Loose) as json.schema.JsonSchema;
+export async function validateWorkspace(data: json.JsonObject): Promise<void> {
+  const schema = readAndParseJson(path.join(__dirname, '../lib/config/schema.json')) as json.schema.JsonSchema;
   const { formats } = await import('@angular-devkit/schematics');
   const registry = new json.schema.CoreSchemaRegistry(formats.standardFormats);
   const validator = await registry.compile(schema).toPromise();
@@ -321,13 +314,12 @@ export function migrateLegacyGlobalConfig(): boolean {
   if (homeDir) {
     const legacyGlobalConfigPath = path.join(homeDir, '.angular-cli.json');
     if (existsSync(legacyGlobalConfigPath)) {
-      const content = readFileSync(legacyGlobalConfigPath, 'utf-8');
-      const legacy = parseJson(content, JsonParseMode.Loose);
+      const legacy = readAndParseJson(legacyGlobalConfigPath);
       if (!isJsonObject(legacy)) {
         return false;
       }
 
-      const cli: JsonObject = {};
+      const cli: json.JsonObject = {};
 
       if (
         legacy.packageManager &&
@@ -346,7 +338,7 @@ export function migrateLegacyGlobalConfig(): boolean {
       }
 
       if (isJsonObject(legacy.warnings)) {
-        const warnings: JsonObject = {};
+        const warnings: json.JsonObject = {};
         if (typeof legacy.warnings.versionMismatch == 'boolean') {
           warnings['versionMismatch'] = legacy.warnings.versionMismatch;
         }
@@ -374,9 +366,7 @@ function getLegacyPackageManager(): string | null {
   if (homeDir) {
     const legacyGlobalConfigPath = path.join(homeDir, '.angular-cli.json');
     if (existsSync(legacyGlobalConfigPath)) {
-      const content = readFileSync(legacyGlobalConfigPath, 'utf-8');
-
-      const legacy = parseJson(content, JsonParseMode.Loose);
+      const legacy = readAndParseJson(legacyGlobalConfigPath);
       if (!isJsonObject(legacy)) {
         return null;
       }
diff --git a/packages/angular/cli/utilities/find-up.ts b/packages/angular/cli/utilities/find-up.ts
index 81891a96e565..3427d7ba15f4 100644
--- a/packages/angular/cli/utilities/find-up.ts
+++ b/packages/angular/cli/utilities/find-up.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/tasks/install-package.ts b/packages/angular/cli/utilities/install-package.ts
similarity index 95%
rename from packages/angular/cli/tasks/install-package.ts
rename to packages/angular/cli/utilities/install-package.ts
index a4862a3966b3..8bdf179230e3 100644
--- a/packages/angular/cli/tasks/install-package.ts
+++ b/packages/angular/cli/utilities/install-package.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -26,7 +26,7 @@ interface PackageManagerOptions {
 
 export function installPackage(
   packageName: string,
-  logger: logging.Logger,
+  logger: logging.Logger | undefined,
   packageManager: PackageManager = PackageManager.Npm,
   save: Exclude<NgAddSaveDepedency, false> = true,
   extraArgs: string[] = [],
@@ -40,7 +40,7 @@ export function installPackage(
     packageManagerArgs.silent,
   ];
 
-  logger.info(colors.green(`Installing packages for tooling via ${packageManager}.`));
+  logger?.info(colors.green(`Installing packages for tooling via ${packageManager}.`));
 
   if (save === 'devDependencies') {
     installArgs.push(packageManagerArgs.saveDev);
@@ -61,12 +61,12 @@ export function installPackage(
     throw new Error(errorMessage + `Package install failed${errorMessage ? ', see above' : ''}.`);
   }
 
-  logger.info(colors.green(`Installed packages for tooling via ${packageManager}.`));
+  logger?.info(colors.green(`Installed packages for tooling via ${packageManager}.`));
 }
 
 export function installTempPackage(
   packageName: string,
-  logger: logging.Logger,
+  logger: logging.Logger | undefined,
   packageManager: PackageManager = PackageManager.Npm,
   extraArgs?: string[],
 ): string {
diff --git a/packages/angular/cli/utilities/json-file.ts b/packages/angular/cli/utilities/json-file.ts
new file mode 100644
index 000000000000..7163df2b0751
--- /dev/null
+++ b/packages/angular/cli/utilities/json-file.ts
@@ -0,0 +1,125 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 '@angular-devkit/core';
+import { readFileSync, writeFileSync } from 'fs';
+import {
+  Node, ParseError, applyEdits, findNodeAtLocation,
+  getNodeValue, modify, parse, parseTree, printParseErrorCode,
+} from 'jsonc-parser';
+
+export type InsertionIndex = (properties: string[]) => number;
+export type JSONPath = (string | number)[];
+
+/** @internal */
+export class JSONFile {
+  content: string;
+
+  constructor(
+    private readonly path: string,
+  ) {
+    const buffer = readFileSync(this.path);
+    if (buffer) {
+      this.content = buffer.toString();
+    } else {
+      throw new Error(`Could not read '${path}'.`);
+    }
+  }
+
+  private _jsonAst: Node | undefined;
+  private get JsonAst(): Node | undefined {
+    if (this._jsonAst) {
+      return this._jsonAst;
+    }
+
+    const errors: ParseError[] = [];
+    this._jsonAst = parseTree(this.content, errors, { allowTrailingComma: true });
+    if (errors.length) {
+      formatError(this.path, errors);
+    }
+
+    return this._jsonAst;
+  }
+
+  get(jsonPath: JSONPath): unknown {
+    const jsonAstNode = this.JsonAst;
+    if (!jsonAstNode) {
+      return undefined;
+    }
+
+    if (jsonPath.length === 0) {
+      return getNodeValue(jsonAstNode);
+    }
+
+    const node = findNodeAtLocation(jsonAstNode, jsonPath);
+
+    return node === undefined ? undefined : getNodeValue(node);
+  }
+
+  modify(jsonPath: JSONPath, value: JsonValue | undefined, insertInOrder?: InsertionIndex | false): boolean {
+    if (value === undefined && this.get(jsonPath) === undefined) {
+      // Cannot remove a value which doesn't exist.
+      return false;
+    }
+
+    let getInsertionIndex: InsertionIndex | undefined;
+    if (insertInOrder === undefined) {
+      const property = jsonPath.slice(-1)[0];
+      getInsertionIndex = properties => [...properties, property].sort().findIndex(p => p === property);
+    } else if (insertInOrder !== false) {
+      getInsertionIndex = insertInOrder;
+    }
+
+    const edits = modify(
+      this.content,
+      jsonPath,
+      value,
+      {
+        getInsertionIndex,
+        formattingOptions: {
+          insertSpaces: true,
+          tabSize: 2,
+        },
+      },
+    );
+
+    if (edits.length === 0) {
+      return false;
+    }
+
+    this.content = applyEdits(this.content, edits);
+    this._jsonAst = undefined;
+
+    return true;
+  }
+
+  save(): void {
+    writeFileSync(this.path, this.content);
+  }
+}
+
+// tslint:disable-next-line: no-any
+export function readAndParseJson(path: string): any {
+  const errors: ParseError[] = [];
+  const content = parse(readFileSync(path, 'utf-8'), errors, { allowTrailingComma: true });
+  if (errors.length) {
+    formatError(path, errors);
+  }
+
+  return content;
+}
+
+function formatError(path: string, errors: ParseError[]): never {
+  const { error, offset } = errors[0];
+  throw new Error(`Failed to parse "${path}" as JSON AST Object. ${printParseErrorCode(error)} at location: ${offset}.`);
+}
+
+// tslint:disable-next-line: no-any
+export function parseJson(content: string): any {
+  return parse(content, undefined, { allowTrailingComma: true });
+}
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index abd856c4196a..d50fd7fbabd4 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -251,6 +251,11 @@ export async function parseJsonSchemaToOptions(
     const xUserAnalytics = current['x-user-analytics'];
     const userAnalytics = typeof xUserAnalytics == 'number' ? xUserAnalytics : undefined;
 
+    // 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),
@@ -262,6 +267,7 @@ export async function parseJsonSchemaToOptions(
       ...format !== undefined ? { format } : {},
       hidden,
       ...userAnalytics ? { userAnalytics } : {},
+      ...deprecated !== undefined ? { deprecated } : {},
       ...positional !== undefined ? { positional } : {},
     };
 
diff --git a/packages/angular/cli/utilities/json-schema_spec.ts b/packages/angular/cli/utilities/json-schema_spec.ts
index 09822cef7730..727ce7836065 100644
--- a/packages/angular/cli/utilities/json-schema_spec.ts
+++ b/packages/angular/cli/utilities/json-schema_spec.ts
@@ -1,10 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
diff --git a/packages/angular/cli/utilities/log-file.ts b/packages/angular/cli/utilities/log-file.ts
index 4e5d33bb4571..41dc036fc028 100644
--- a/packages/angular/cli/utilities/log-file.ts
+++ b/packages/angular/cli/utilities/log-file.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/utilities/package-manager.ts b/packages/angular/cli/utilities/package-manager.ts
index 77d1318750f9..3163060db231 100644
--- a/packages/angular/cli/utilities/package-manager.ts
+++ b/packages/angular/cli/utilities/package-manager.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,6 +8,7 @@
 import { execSync } from 'child_process';
 import { existsSync } from 'fs';
 import { join } from 'path';
+import { satisfies, valid } from 'semver';
 import { PackageManager } from '../lib/config/schema';
 import { getConfiguredPackageManager } from './config';
 
@@ -54,3 +55,30 @@ export async function getPackageManager(root: string): Promise<PackageManager> {
   //       Potentially with a prompt to choose and optionally set as the default.
   return packageManager || PackageManager.Npm;
 }
+
+/**
+ * Checks if the npm version is a supported 7.x version.  If not, display a warning.
+ */
+export async function ensureCompatibleNpm(root: string): Promise<void> {
+  if ((await getPackageManager(root)) !== PackageManager.Npm) {
+    return;
+  }
+
+  try {
+    const versionText = execSync('npm --version', {encoding: 'utf8', stdio: 'pipe'}).trim();
+    const version = valid(versionText);
+    if (!version) {
+      return;
+    }
+
+    if (satisfies(version, '>=7 <7.5.6')) {
+      // tslint:disable-next-line: no-console
+      console.warn(
+        `npm version ${version} detected.` +
+          ' When using npm 7 with the Angular CLI, npm version 7.5.6 or higher is recommended.',
+      );
+    }
+  } catch {
+    // npm is not installed
+  }
+}
diff --git a/packages/angular/cli/utilities/package-metadata.ts b/packages/angular/cli/utilities/package-metadata.ts
index 34e5b4e0bf6f..e5c728ec76fb 100644
--- a/packages/angular/cli/utilities/package-metadata.ts
+++ b/packages/angular/cli/utilities/package-metadata.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -57,18 +57,20 @@ export interface PackageMetadata {
   'dist-tags'?: unknown;
 }
 
-let npmrc: { [key: string]: string };
+type PackageManagerOptions = Record<string, unknown>;
+
+let npmrc: PackageManagerOptions;
 
 function ensureNpmrc(logger: logging.LoggerApi, usingYarn: boolean, verbose: boolean): void {
   if (!npmrc) {
     try {
       npmrc = readOptions(logger, false, verbose);
-    } catch {}
+    } catch { }
 
     if (usingYarn) {
       try {
         npmrc = { ...npmrc, ...readOptions(logger, true, verbose) };
-      } catch {}
+      } catch { }
     }
   }
 }
@@ -77,7 +79,7 @@ function readOptions(
   logger: logging.LoggerApi,
   yarn = false,
   showPotentials = false,
-): Record<string, string> {
+): PackageManagerOptions {
   const cwd = process.cwd();
   const baseFilename = yarn ? 'yarnrc' : 'npmrc';
   const dotFilename = '.' + baseFilename;
@@ -107,7 +109,7 @@ function readOptions(
     logger.info(`Locating potential ${baseFilename} files:`);
   }
 
-  let options: { [key: string]: string } = {};
+  const options: PackageManagerOptions = {};
   for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
     if (existsSync(location)) {
       if (showPotentials) {
@@ -115,17 +117,40 @@ function readOptions(
       }
 
       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 {}
+      // Normalize RC options that are needed by 'npm-registry-fetch'.
+      // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
+      const rcConfig: PackageManagerOptions = yarn ? lockfile.parse(data) : ini.parse(data);
+      for (const [key, value] of Object.entries(rcConfig)) {
+        switch (key) {
+          case 'noproxy':
+          case 'no-proxy':
+            options['noProxy'] = value;
+            break;
+          case 'maxsockets':
+            options['maxSockets'] = value;
+            break;
+          case 'https-proxy':
+          case 'proxy':
+            options['proxy'] = value;
+            break;
+          case 'strict-ssl':
+            options['strictSSL'] = value;
+            break;
+          case 'local-address':
+            options['localAddress'] = value;
+            break;
+          case 'cafile':
+            if (typeof value === 'string') {
+              const cafile = path.resolve(path.dirname(location), value);
+              try {
+                options['ca'] = readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
+              } catch { }
+            }
+            break;
+          default:
+            options[key] = value;
+            break;
+        }
       }
     } else if (showPotentials) {
       logger.info(`Trying '${location}'...not found.`);
@@ -134,8 +159,9 @@ function readOptions(
 
   // Substitute any environment variable references
   for (const key in options) {
-    if (typeof options[key] === 'string') {
-      options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    const value = options[key];
+    if (typeof value === 'string') {
+      options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
     }
   }
 
diff --git a/packages/angular/cli/utilities/package-tree.ts b/packages/angular/cli/utilities/package-tree.ts
index 85505e16531b..d4b7bba35e0b 100644
--- a/packages/angular/cli/utilities/package-tree.ts
+++ b/packages/angular/cli/utilities/package-tree.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/utilities/project.ts b/packages/angular/cli/utilities/project.ts
index cd133cd0323a..d7a4f8bc1ca8 100644
--- a/packages/angular/cli/utilities/project.ts
+++ b/packages/angular/cli/utilities/project.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/cli/utilities/spinner.ts b/packages/angular/cli/utilities/spinner.ts
new file mode 100644
index 000000000000..21f3494a98da
--- /dev/null
+++ b/packages/angular/cli/utilities/spinner.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 ora from 'ora';
+import { colors } from './color';
+
+export class Spinner {
+  private readonly spinner: ora.Ora;
+
+  /** When false, only fail messages will be displayed. */
+  enabled = true;
+
+  constructor(text?: string) {
+    this.spinner = ora({
+      text,
+      // The below 2 options are needed because otherwise CTRL+C will be delayed
+      // when the underlying process is sync.
+      hideCursor: false,
+      discardStdin: false,
+    });
+  }
+
+  set text(text: string) {
+    this.spinner.text = text;
+  }
+
+  succeed(text?: string): void {
+    if (this.enabled) {
+      this.spinner.succeed(text);
+    }
+  }
+
+  info(text?: string): void {
+    this.spinner.info(text);
+  }
+
+  fail(text?: string): void {
+    this.spinner.fail(text && colors.redBright(text));
+  }
+
+  warn(text?: string): void {
+    this.spinner.fail(text && colors.yellowBright(text));
+  }
+
+  stop(): void {
+    this.spinner.stop();
+  }
+
+  start(text?: string): void {
+    if (this.enabled) {
+      this.spinner.start(text);
+    }
+  }
+}
diff --git a/packages/angular/cli/utilities/tty.ts b/packages/angular/cli/utilities/tty.ts
index dd5931e26fb6..1e5658ebfd57 100644
--- a/packages/angular/cli/utilities/tty.ts
+++ b/packages/angular/cli/utilities/tty.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/pwa/README.md b/packages/angular/pwa/README.md
new file mode 100644
index 000000000000..9a2d8181fb8a
--- /dev/null
+++ b/packages/angular/pwa/README.md
@@ -0,0 +1,22 @@
+# `@angular/pwa`
+
+This is a [schematic](https://angular.io/guide/schematics) for adding
+[Progress Web App](https://web.dev/progressive-web-apps/) support to an Angular app. Run the
+schematic with the [Angular CLI](https://angular.io/cli):
+
+```shell
+ng add @angular/pwa
+```
+
+This makes a few changes to your project:
+
+1. Adds [`@angular/service-worker`](https://npmjs.com/@angular/service-worker) as a dependency.
+1. Enables service worker builds in the Angular CLI.
+1. Imports and registers the service worker in the app module.
+1. Adds a [web app manifest](https://developer.mozilla.org/en-US/docs/Web/Manifest).
+1. Updates the `index.html` file to link to the manifest and set theme colors.
+1. Adds required icons for the manifest.
+1. Creates a config file `ngsw-config.json`, specifying caching behaviors and other settings.
+
+See [Getting started with service workers](https://angular.io/guide/service-worker-getting-started)
+for more information.
diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index 3fac23935f01..17cd5da7d46b 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index b3a54fffcbcc..95bef3167bd0 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/builders/all-of.ts b/packages/angular_devkit/architect/builders/all-of.ts
index 0b9d958b1f7c..f846fcd32f21 100644
--- a/packages/angular_devkit/architect/builders/all-of.ts
+++ b/packages/angular_devkit/architect/builders/all-of.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/builders/concat.ts b/packages/angular_devkit/architect/builders/concat.ts
index 816cb2028091..68d21b297968 100644
--- a/packages/angular_devkit/architect/builders/concat.ts
+++ b/packages/angular_devkit/architect/builders/concat.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/builders/false.ts b/packages/angular_devkit/architect/builders/false.ts
index 3ae22b054e59..7cdb9b9d56eb 100644
--- a/packages/angular_devkit/architect/builders/false.ts
+++ b/packages/angular_devkit/architect/builders/false.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/builders/true.ts b/packages/angular_devkit/architect/builders/true.ts
index ea617c33fd2b..6b110c012a3c 100644
--- a/packages/angular_devkit/architect/builders/true.ts
+++ b/packages/angular_devkit/architect/builders/true.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/node/index.ts b/packages/angular_devkit/architect/node/index.ts
index 721047f44093..ab719a3f8ba3 100644
--- a/packages/angular_devkit/architect/node/index.ts
+++ b/packages/angular_devkit/architect/node/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 8562b8e07ea6..d4cff7208631 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -28,17 +28,86 @@ function clone(obj: unknown): unknown {
   }
 }
 
-// TODO: create a base class for all workspace related hosts.
-export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModulesBuilderInfo> {
-  constructor(protected _workspace: workspaces.WorkspaceDefinition, protected _root: string) {}
+export interface WorkspaceHost {
+  getBuilderName(project: string, target: string): Promise<string>;
+  getMetadata(project: string): Promise<json.JsonObject>;
+  getOptions(project: string, target: string, configuration?: string): Promise<json.JsonObject>;
+  hasTarget(project: string, target: string): Promise<boolean>;
+}
 
-  async getBuilderNameForTarget(target: Target) {
-    const targetDefinition = this.findProjectTarget(target);
-    if (!targetDefinition) {
-      throw new Error('Project target does not exist.');
+function findProjectTarget(
+  workspace: workspaces.WorkspaceDefinition,
+  project: string,
+  target: string,
+): workspaces.TargetDefinition {
+  const projectDefinition = workspace.projects.get(project);
+  if (!projectDefinition) {
+    throw new Error(`Project "${project}" does not exist.`);
+  }
+
+  const targetDefinition = projectDefinition.targets.get(target);
+  if (!targetDefinition) {
+    throw new Error('Project target does not exist.');
+  }
+
+  return targetDefinition;
+}
+
+export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModulesBuilderInfo> {
+  private workspaceHost: WorkspaceHost;
+
+  constructor(workspaceHost: WorkspaceHost, _root: string);
+
+  constructor(workspace: workspaces.WorkspaceDefinition, _root: string);
+
+  constructor(
+    workspaceOrHost: workspaces.WorkspaceDefinition | WorkspaceHost,
+    protected _root: string,
+  ) {
+    if ('getBuilderName' in workspaceOrHost) {
+      this.workspaceHost = workspaceOrHost;
+    } else {
+      this.workspaceHost = {
+        async getBuilderName(project, target) {
+          const targetDefinition = findProjectTarget(workspaceOrHost, project, target);
+
+          return targetDefinition.builder;
+        },
+        async getOptions(project, target, configuration) {
+          const targetDefinition = findProjectTarget(workspaceOrHost, project, target);
+
+          if (configuration === undefined) {
+            return (targetDefinition.options ?? {}) as json.JsonObject;
+          }
+
+          if (!targetDefinition.configurations?.[configuration]) {
+            throw new Error(`Configuration '${configuration}' is not set in the workspace.`);
+          }
+
+          return (targetDefinition.configurations?.[configuration] ?? {}) as json.JsonObject;
+        },
+        async getMetadata(project) {
+          const projectDefinition = workspaceOrHost.projects.get(project);
+          if (!projectDefinition) {
+            throw new Error(`Project "${project}" does not exist.`);
+          }
+
+          return ({
+            root: projectDefinition.root,
+            sourceRoot: projectDefinition.sourceRoot,
+            prefix: projectDefinition.prefix,
+            ...(clone(projectDefinition.extensions) as {}),
+          } as unknown) as json.JsonObject;
+        },
+        async hasTarget(project, target) {
+          return !!workspaceOrHost.projects.get(project)?.targets.has(target);
+        },
+      };
     }
+  }
 
-    return targetDefinition.builder;
+  async getBuilderNameForTarget(target: Target) {
+    return this.workspaceHost.getBuilderName(target.project, target.target);
   }
 
   /**
@@ -95,49 +164,28 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
   }
 
   async getOptionsForTarget(target: Target): Promise<json.JsonObject | null> {
-    const targetSpec = this.findProjectTarget(target);
-    if (targetSpec === undefined) {
+    if (!(await this.workspaceHost.hasTarget(target.project, target.target))) {
       return null;
     }
 
-    let additionalOptions = {};
+    let options = await this.workspaceHost.getOptions(target.project, target.target);
 
     if (target.configuration) {
-      const configurations = target.configuration.split(',').map(c => c.trim());
+      const configurations = target.configuration.split(',').map((c) => c.trim());
       for (const configuration of configurations) {
-        if (!(targetSpec['configurations'] && targetSpec['configurations'][configuration])) {
-          throw new Error(`Configuration '${configuration}' is not set in the workspace.`);
-        } else {
-          additionalOptions = {
-            ...additionalOptions,
-            ...targetSpec['configurations'][configuration],
-          };
-        }
+        options = {
+          ...options,
+          ...await this.workspaceHost.getOptions(target.project, target.target, configuration),
+        };
       }
     }
 
-    const options = {
-      ...targetSpec['options'],
-      ...additionalOptions,
-    };
-
     return clone(options) as json.JsonObject;
   }
 
   async getProjectMetadata(target: Target | string): Promise<json.JsonObject | null> {
     const projectName = typeof target === 'string' ? target : target.project;
-
-    const projectDefinition = this._workspace.projects.get(projectName);
-    if (!projectDefinition) {
-      throw new Error(`Project "${projectName}" does not exist.`);
-    }
-
-    const metadata = ({
-      root: projectDefinition.root,
-      sourceRoot: projectDefinition.sourceRoot,
-      prefix: projectDefinition.prefix,
-      ...clone(projectDefinition.extensions) as {},
-    } as unknown) as json.JsonObject;
+    const metadata = this.workspaceHost.getMetadata(projectName);
 
     return metadata;
   }
@@ -150,13 +198,4 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
 
     throw new Error('Builder is not a builder');
   }
-
-  private findProjectTarget(target: Target) {
-    const projectDefinition = this._workspace.projects.get(target.project);
-    if (!projectDefinition) {
-      throw new Error(`Project "${target.project}" does not exist.`);
-    }
-
-    return projectDefinition.targets.get(target.target);
-  }
 }
diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index f5e0e64650be..b48ea271ab89 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/api_spec.ts b/packages/angular_devkit/architect/src/api_spec.ts
index 73bc6288a274..73e2d4d02438 100644
--- a/packages/angular_devkit/architect/src/api_spec.ts
+++ b/packages/angular_devkit/architect/src/api_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 7e8c18fd0d59..275cfc0c1637 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 416c895f3273..df244330c13d 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index a21d4ff324b2..dcfbb9d7e7c9 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
index 57d76c5a6497..1a7fc195bcfa 100644
--- a/packages/angular_devkit/architect/src/index_spec.ts
+++ b/packages/angular_devkit/architect/src/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/internal.ts b/packages/angular_devkit/architect/src/internal.ts
index deaf25047160..523e90344dc8 100644
--- a/packages/angular_devkit/architect/src/internal.ts
+++ b/packages/angular_devkit/architect/src/internal.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index 40df0258bb10..427b1987c772 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/testing/index.ts b/packages/angular_devkit/architect/testing/index.ts
index 7fa6e21ba74d..12e628b911ca 100644
--- a/packages/angular_devkit/architect/testing/index.ts
+++ b/packages/angular_devkit/architect/testing/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/testing/test-project-host.ts b/packages/angular_devkit/architect/testing/test-project-host.ts
index f8766c3a8260..6456444853bf 100644
--- a/packages/angular_devkit/architect/testing/test-project-host.ts
+++ b/packages/angular_devkit/architect/testing/test-project-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
index c7d901f3906b..33f61a386b51 100644
--- a/packages/angular_devkit/architect/testing/testing-architect-host.ts
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect_cli/README.md b/packages/angular_devkit/architect_cli/README.md
new file mode 100644
index 000000000000..3dae8d2fe2eb
--- /dev/null
+++ b/packages/angular_devkit/architect_cli/README.md
@@ -0,0 +1,19 @@
+# Architect CLI
+
+This package contains the executable for running an [Architect Builder](/packages/angular_devkit/architect/README.md).
+
+# Usage
+
+```
+architect [project][:target][:configuration] [options, ...]
+
+Run a project target.
+If project/target/configuration are not specified, the workspace defaults will be used.
+
+Options:
+    --help              Show available options for project target.
+                        Shows this message instead when ran without the run argument.
+
+
+Any additional option is passed the target, overriding existing options.
+```
diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index cbc3983702dc..04f0197bad29 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index 3f58defda4cb..6ac3bbb2d5eb 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",
+  "homepage": "https://github.com/angular/angular-cli",
   "experimental": true,
   "bin": {
     "architect": "./bin/architect.js"
@@ -16,10 +17,10 @@
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "ansi-colors": "4.1.1",
-    "minimist": "1.2.5",
+    "minimist": "1.2.6",
     "progress": "2.0.3",
     "rxjs": "6.6.3",
-    "symbol-observable": "2.0.3"
+    "symbol-observable": "3.0.0"
   },
   "devDependencies": {
     "@types/progress": "2.0.3"
diff --git a/packages/angular_devkit/architect_cli/src/progress.ts b/packages/angular_devkit/architect_cli/src/progress.ts
index f326b3571731..3e787f0862de 100644
--- a/packages/angular_devkit/architect_cli/src/progress.ts
+++ b/packages/angular_devkit/architect_cli/src/progress.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 4a482add2b80..32b655023d9b 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",
     "ansi-colors": "4.1.1",
-    "minimist": "1.2.5",
+    "minimist": "1.2.6",
     "pidusage": "2.0.21",
     "pidtree": "0.5.0",
     "rxjs": "6.6.3",
diff --git a/packages/angular_devkit/benchmark/src/command.ts b/packages/angular_devkit/benchmark/src/command.ts
index 03003a0f11b1..371cba2a961d 100644
--- a/packages/angular_devkit/benchmark/src/command.ts
+++ b/packages/angular_devkit/benchmark/src/command.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/default-reporter.ts b/packages/angular_devkit/benchmark/src/default-reporter.ts
index 9224cbe8c057..811a7b978444 100644
--- a/packages/angular_devkit/benchmark/src/default-reporter.ts
+++ b/packages/angular_devkit/benchmark/src/default-reporter.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture.ts b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
index 8a733ca3d194..b4f383e0ae0d 100644
--- a/packages/angular_devkit/benchmark/src/default-stats-capture.ts
+++ b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts b/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
index 5c66a3c5636b..3a4a58688203 100644
--- a/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
+++ b/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/index.ts b/packages/angular_devkit/benchmark/src/index.ts
index ead611a2058c..769f577079a0 100644
--- a/packages/angular_devkit/benchmark/src/index.ts
+++ b/packages/angular_devkit/benchmark/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/interfaces.ts b/packages/angular_devkit/benchmark/src/interfaces.ts
index 99195ccf4284..5dde922dfd27 100644
--- a/packages/angular_devkit/benchmark/src/interfaces.ts
+++ b/packages/angular_devkit/benchmark/src/interfaces.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/main.ts b/packages/angular_devkit/benchmark/src/main.ts
index 96396c9bc544..c6b855fa296d 100644
--- a/packages/angular_devkit/benchmark/src/main.ts
+++ b/packages/angular_devkit/benchmark/src/main.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/main_spec.ts b/packages/angular_devkit/benchmark/src/main_spec.ts
index 61d69802f61a..77734a3d51cc 100644
--- a/packages/angular_devkit/benchmark/src/main_spec.ts
+++ b/packages/angular_devkit/benchmark/src/main_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/monitored-process.ts b/packages/angular_devkit/benchmark/src/monitored-process.ts
index 0a7435d8b202..68c5693e3007 100644
--- a/packages/angular_devkit/benchmark/src/monitored-process.ts
+++ b/packages/angular_devkit/benchmark/src/monitored-process.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/monitored-process_spec.ts b/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
index 12757d6e8dac..ca515ed5c590 100644
--- a/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
+++ b/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts b/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts
index 7bd6754bea84..8da0db60252d 100644
--- a/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts
+++ b/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/run-benchmark.ts b/packages/angular_devkit/benchmark/src/run-benchmark.ts
index bd551090dbd0..f79c8f558575 100644
--- a/packages/angular_devkit/benchmark/src/run-benchmark.ts
+++ b/packages/angular_devkit/benchmark/src/run-benchmark.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/benchmark/src/utils.ts b/packages/angular_devkit/benchmark/src/utils.ts
index ea8fc36205ee..304194173862 100644
--- a/packages/angular_devkit/benchmark/src/utils.ts
+++ b/packages/angular_devkit/benchmark/src/utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
index 5333457ab981..7499a11dee6d 100644
--- a/packages/angular_devkit/build_angular/BUILD.bazel
+++ b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -71,7 +71,9 @@ ts_library(
         exclude = [
             "src/test-utils.ts",
             "src/**/*_spec.ts",
+            "src/**/tests/**/*.ts",
             "plugins/**/*_spec.ts",
+            "src/testing/**/*.ts",
         ],
     ) + [
         "//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
@@ -111,6 +113,7 @@ ts_library(
         "@npm//@babel/preset-env",
         "@npm//@babel/runtime",
         "@npm//@babel/template",
+        "@npm//@discoveryjs/json-ext",
         "@npm//@jsdevtools/coverage-istanbul-loader",
         "@npm//@types/babel__core",
         "@npm//@types/babel__template",
@@ -145,11 +148,13 @@ ts_library(
         "@npm//circular-dependency-plugin",
         "@npm//copy-webpack-plugin",
         "@npm//core-js",
+        "@npm//critters",
         "@npm//css-loader",
         "@npm//cssnano",
         "@npm//file-loader",
         "@npm//find-cache-dir",
         "@npm//glob",
+        "@npm//https-proxy-agent",
         "@npm//inquirer",
         "@npm//jest-worker",
         "@npm//karma",
@@ -248,7 +253,13 @@ pkg_tar(
 ts_library(
     name = "build_angular_test_utils",
     testonly = True,
-    srcs = [":src/test-utils.ts"],
+    srcs = glob(
+        include = [
+            "src/test-utils.ts",
+            "src/testing/**/*.ts",
+            "src/**/tests/*.ts",
+        ],
+    ),
     data = glob(["test/**/*"]),
     tsconfig = "//:tsconfig-test.json",
     deps = [
@@ -258,6 +269,7 @@ ts_library(
         "//packages/angular_devkit/architect/testing",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core/node",
+        "@npm//rxjs",
     ],
 )
 
@@ -282,6 +294,8 @@ LARGE_SPECS = {
             "@npm//@types/node-fetch",
             "@npm//express",
             "@npm//node-fetch",
+            "@npm//@types/http-proxy",
+            "@npm//http-proxy",
             "@npm//puppeteer",
         ],
     },
diff --git a/packages/angular_devkit/build_angular/README.md b/packages/angular_devkit/build_angular/README.md
index 1c5c8a806b2b..1cf05e9dcc5f 100644
--- a/packages/angular_devkit/build_angular/README.md
+++ b/packages/angular_devkit/build_angular/README.md
@@ -1,3 +1,20 @@
-# Angular Webpack Build Facade
+# @angular-devkit/build-angular
 
-WIP
\ No newline at end of file
+This package contains [Architect builders](/packages/angular_devkit/architect/README.md) used to build and test Angular applications and libraries.
+
+##  Builders
+Name | Description
+-----|-------------
+app-shell | Build an Angular [App shell](https://angular.io/guide/app-shell).
+browser | Build an Angular application targeting a browser environment.
+dev-server | A development server that provides live reloading.
+extract-i18n | Extract i18n messages from an Angular application.
+karma | Execute unit tests using [Karma](https://github.com/karma-runner/karma) test runner.
+ng-packagr | Build and package an Angular library in [Angular Package Format (APF)](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/preview) format using [ng-packagr](https://github.com/ng-packagr/ng-packagr).
+server | Build an Angular application targeting a [Node.js](https://nodejs.org) environment.
+protractor | Run end-to-end tests using [Protractor](https://www.protractortest.org/) framework.
+tslint | **Deprecated** - Statically analyze [TypeScript](https://www.typescriptlang.org/) files using [TSLint](https://palantir.github.io/tslint/). 
+
+## Disclaimer
+
+While the builders when executed via the Angular CLI and their associated options are considered stable, the programmatic APIs are not considered officially supported and are not subject to the breaking change guarantees of SemVer.
\ 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 25d928b5aa20..549f6775c339 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,85 +11,94 @@
     "@angular-devkit/build-optimizer": "0.0.0",
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "@babel/core": "7.11.6",
-    "@babel/generator": "7.11.6",
-    "@babel/plugin-transform-runtime": "7.11.5",  
-    "@babel/preset-env": "7.11.5",
-    "@babel/runtime": "7.11.2",
-    "@babel/template": "7.10.4",
+    "@babel/core": "7.12.10",
+    "@babel/generator": "7.12.11",
+    "@babel/plugin-transform-async-to-generator": "7.12.1",
+    "@babel/plugin-transform-runtime": "7.12.10",
+    "@babel/preset-env": "7.12.11",
+    "@babel/runtime": "7.12.5",
+    "@babel/template": "7.12.7",
+    "@discoveryjs/json-ext": "0.5.2",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@ngtools/webpack": "0.0.0",
     "ansi-colors": "4.1.1",
-    "autoprefixer": "9.8.6",
-    "babel-loader": "8.1.0",
+    "autoprefixer": "10.2.4",
+    "babel-loader": "8.2.2",
     "browserslist": "^4.9.1",
     "cacache": "15.0.5",
     "caniuse-lite": "^1.0.30001032",
-    "circular-dependency-plugin": "5.2.0",
-    "copy-webpack-plugin": "6.2.1",
-    "core-js": "3.6.5",
-    "css-loader": "5.0.0",
-    "cssnano": "4.1.10",
-    "file-loader": "6.1.1",
+    "circular-dependency-plugin": "5.2.2",
+    "copy-webpack-plugin": "6.3.2",
+    "core-js": "3.8.3",
+    "critters": "0.0.12",
+    "css-loader": "5.0.1",
+    "cssnano": "5.0.2",
+    "file-loader": "6.2.0",
     "find-cache-dir": "3.3.1",
     "glob": "7.1.6",
+    "https-proxy-agent": "5.0.0",
     "inquirer": "7.3.3",
-    "jest-worker": "26.5.0",
+    "jest-worker": "26.6.2",
     "karma-source-map-support": "1.4.0",
-    "less": "3.12.2",
-    "less-loader": "7.0.2",
-    "license-webpack-plugin": "2.3.0",
+    "less": "4.1.1",
+    "less-loader": "7.3.0",
+    "license-webpack-plugin": "2.3.11",
     "loader-utils": "2.0.0",
-    "mini-css-extract-plugin": "1.0.0",
+    "mini-css-extract-plugin": "1.3.5",
     "minimatch": "3.0.4",
-    "open": "7.3.0",
-    "ora": "5.1.0",
+    "open": "7.4.0",
+    "ora": "5.3.0",
     "parse5-html-rewriting-stream": "6.0.1",
     "pnp-webpack-plugin": "1.6.4",
-    "postcss": "7.0.32",
-    "postcss-import": "12.0.1",
-    "postcss-loader": "4.0.4",
+    "postcss": "8.2.15",
+    "postcss-import": "14.0.0",
+    "postcss-loader": "4.2.0",
     "raw-loader": "4.0.2",
     "regenerator-runtime": "0.13.7",
-    "resolve-url-loader": "3.1.1",
+    "resolve-url-loader": "4.0.0",
     "rimraf": "3.0.2",
-    "rollup": "2.30.0",
+    "rollup": "2.38.4",
     "rxjs": "6.6.3",
-    "sass": "1.27.0",
-    "sass-loader": "10.0.3",
-    "semver": "7.3.2",
+    "sass": "1.32.6",
+    "sass-loader": "10.1.1",
+    "semver": "7.3.4",
     "source-map": "0.7.3",
-    "source-map-loader": "1.1.1",
+    "source-map-loader": "1.1.3",
     "source-map-support": "0.5.19",
-    "speed-measure-webpack-plugin": "1.3.3",
+    "speed-measure-webpack-plugin": "1.4.2",
     "style-loader": "2.0.0",
     "stylus": "0.54.8",
-    "stylus-loader": "4.1.1",
-    "terser": "5.3.5",
+    "stylus-loader": "4.3.3",
+    "terser": "5.5.1",
     "terser-webpack-plugin": "4.2.3",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "webpack": "4.44.2",
     "webpack-dev-middleware": "3.7.2",
-    "webpack-dev-server": "3.11.0",
-    "webpack-merge": "5.2.0",
-    "webpack-sources": "2.0.1",
-    "webpack-subresource-integrity": "1.5.0",
+    "webpack-dev-server": "3.11.3",
+    "webpack-merge": "5.7.3",
+    "webpack-sources": "2.2.0",
+    "webpack-subresource-integrity": "1.5.2",
     "worker-plugin": "5.0.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^11.0.0 || ^11.0.0-next",
-    "@angular/localize": "^11.0.0 || ^11.0.0-next",
-    "karma": "^5.2.0",
-    "ng-packagr": "^11.0.0 || ^11.0.0-next",
+    "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+    "@angular/localize": "^11.0.0 || ^11.2.0-next",
+    "@angular/service-worker": "^11.0.0 || ^11.2.0-next",
+    "karma": "^5.2.0 || ^6.0.0",
+    "ng-packagr": "^11.0.0 || ^11.2.0-next",
     "protractor": "^7.0.0",
+    "tailwindcss": "^2.0.0",
     "tslint": "^6.1.0",
-    "typescript": ">=3.9 < 4.1"
+    "typescript": "~4.0.0 || ~4.1.0"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {
       "optional": true
     },
+    "@angular/service-worker": {
+      "optional": true
+    },
     "karma": {
       "optional": true
     },
@@ -99,6 +108,9 @@
     "protractor": {
       "optional": true
     },
+    "tailwindcss": {
+      "optional": true
+    },
     "tslint": {
       "optional": true
     }
diff --git a/packages/angular_devkit/build_angular/plugins/karma.ts b/packages/angular_devkit/build_angular/plugins/karma.ts
index 7a5803a55286..18409cffe9a9 100644
--- a/packages/angular_devkit/build_angular/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/plugins/karma.ts
@@ -1,9 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 
-module.exports = require('../src/webpack/plugins/karma');
+module.exports = require('../src/webpack/plugins/karma/karma');
diff --git a/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts b/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts
index 89d054d43e7d..4e4ef3d53296 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,6 +9,8 @@
 import { Architect } from '@angular-devkit/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
+import * as http from 'http';
+import { AddressInfo } from 'net';
 import { createArchitect, host } from '../test-utils';
 
 describe('AppShell Builder', () => {
@@ -22,6 +24,9 @@ describe('AppShell Builder', () => {
   afterEach(async () => host.restore().toPromise());
 
   const appShellRouteFiles = {
+    'src/styles.css': `
+      p { color: #000 }
+    `,
     'src/app/app-shell/app-shell.component.html': `
       <p>
         app-shell works!
@@ -248,18 +253,44 @@ describe('AppShell Builder', () => {
     // 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);
+    const server = await new Promise<http.Server>((resolve) => {
+      const innerServer = app.listen(0, 'localhost', () => resolve(innerServer));
+    });
+    try {
+      const serverPort = (server.address() as AddressInfo).port;
+      // Load app in protractor, then check service worker status.
+      const protractorRun = await architect.scheduleTarget(
+        { project: 'app-e2e', target: 'e2e' },
+        { baseUrl: `http://localhost:${serverPort}/`, devServerTarget: '' },
+      );
+
+      const protractorOutput = await protractorRun.result;
+      await protractorRun.stop();
+
+      expect(protractorOutput.success).toBe(true);
+    } finally {
+      // Close the express server.
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
 
-    // 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);
+  it('critical CSS is inlined', async () => {
+    host.writeMultipleFiles(appShellRouteFiles);
+    const overrides = {
+      route: 'shell',
+      browserTarget: 'app:build:production,inline-critical-css',
+    };
+
+    const run = await architect.scheduleTarget(target, overrides);
+    const output = await run.result;
+    await run.stop();
 
-    // Close the express server.
-    server.close();
+    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!');
+    expect(content).toContain('p{color:#000}');
+    expect(content).toMatch(/<link rel="stylesheet" href="styles\.[a-z0-9]+\.css" media="print" onload="this\.media='all'">/);
   });
 });
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 f7996f0e68af..e20d01dad734 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -12,13 +12,16 @@ import {
   targetFromTargetString,
 } from '@angular-devkit/architect';
 import { JsonObject, normalize, resolve } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
 import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ServerBuilderOutput } from '../server';
+import { normalizeOptimization } from '../utils';
+import { readFile, writeFile } from '../utils/fs';
+import { InlineCriticalCssProcessor } from '../utils/index-file/inline-critical-css';
 import { augmentAppWithServiceWorker } from '../utils/service-worker';
+import { Spinner } from '../utils/spinner';
 import { Schema as BuildWebpackAppShellSchema } from './schema';
 
 async function _renderUniversal(
@@ -26,22 +29,23 @@ async function _renderUniversal(
   context: BuilderContext,
   browserResult: BrowserBuilderOutput,
   serverResult: ServerBuilderOutput,
+  spinner: Spinner,
 ): Promise<BrowserBuilderOutput> {
   // Get browser target options.
   const browserTarget = targetFromTargetString(options.browserTarget);
-  const rawBrowserOptions = await context.getTargetOptions(browserTarget);
+  const rawBrowserOptions = (await context.getTargetOptions(browserTarget)) as JsonObject & BrowserBuilderSchema;
   const browserBuilderName = await context.getBuilderNameForTarget(browserTarget);
   const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderSchema>(
     rawBrowserOptions,
     browserBuilderName,
   );
 
+
   // Initialize zone.js
   const root = context.workspaceRoot;
   const zonePackage = require.resolve('zone.js', { paths: [root] });
   await import(zonePackage);
 
-  const host = new NodeJsSyncHost();
   const projectName = context.target && context.target.project;
   if (!projectName) {
     throw new Error('The builder requires a target.');
@@ -53,10 +57,18 @@ async function _renderUniversal(
     normalize((projectMetadata.root as string) || ''),
   );
 
+  const { styles } = normalizeOptimization(browserOptions.optimization);
+  const inlineCriticalCssProcessor = styles.inlineCritical
+    ? new InlineCriticalCssProcessor({
+      minify: styles.minify,
+      deployUrl: browserOptions.deployUrl,
+    })
+    : undefined;
+
   for (const outputPath of browserResult.outputPaths) {
     const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
     const browserIndexOutputPath = path.join(outputPath, 'index.html');
-    const indexHtml = fs.readFileSync(browserIndexOutputPath, 'utf8');
+    const indexHtml = await readFile(browserIndexOutputPath, 'utf8');
     const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
 
     const {
@@ -85,17 +97,28 @@ async function _renderUniversal(
       url: options.route,
     };
 
-    const html = await renderModuleFn(AppServerModuleDef, renderOpts);
+    let html = await renderModuleFn(AppServerModuleDef, renderOpts);
     // Overwrite the client index file.
     const outputIndexPath = options.outputIndexPath
       ? path.join(root, options.outputIndexPath)
       : browserIndexOutputPath;
 
-    fs.writeFileSync(outputIndexPath, html);
+    if (inlineCriticalCssProcessor) {
+      const { content, warnings, errors } = await inlineCriticalCssProcessor.process(html, { outputPath });
+      html = content;
+
+      if (warnings.length || errors.length) {
+        spinner.stop();
+        warnings.forEach(m => context.logger.warn(m));
+        errors.forEach(m => context.logger.error(m));
+        spinner.start();
+      }
+    }
+
+    await writeFile(outputIndexPath, html);
 
     if (browserOptions.serviceWorker) {
       await augmentAppWithServiceWorker(
-        host,
         normalize(root),
         projectRoot,
         normalize(outputPath),
@@ -116,24 +139,23 @@ async function _getServerModuleBundlePath(
 ) {
   if (options.appModuleBundle) {
     return path.join(context.workspaceRoot, options.appModuleBundle);
-  } else {
-    const { baseOutputPath = '' } = serverResult;
-    const outputPath = path.join(baseOutputPath, browserLocaleDirectory);
+  }
 
-    if (!fs.existsSync(outputPath)) {
-      throw new Error(`Could not find server output directory: ${outputPath}.`);
-    }
+  const { baseOutputPath = '' } = serverResult;
+  const outputPath = path.join(baseOutputPath, browserLocaleDirectory);
 
-    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 (!fs.existsSync(outputPath)) {
+    throw new Error(`Could not find server output directory: ${outputPath}.`);
+  }
 
-    if (!maybeMain) {
-      throw new Error('Could not find the main bundle.');
-    } else {
-      return path.join(outputPath, maybeMain);
-    }
+  const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?js$/;
+  const maybeMain = fs.readdirSync(outputPath).find(x => re.test(x));
+
+  if (!maybeMain) {
+    throw new Error('Could not find the main bundle.');
   }
+
+  return path.join(outputPath, maybeMain);
 }
 
 async function _appShellBuilder(
@@ -145,14 +167,22 @@ async function _appShellBuilder(
 
   // Never run the browser target in watch mode.
   // If service worker is needed, it will be added in _renderUniversal();
+  const browserOptions = (await context.getTargetOptions(browserTarget)) as JsonObject & BrowserBuilderSchema;
+
+  const optimization = normalizeOptimization(browserOptions.optimization);
+  optimization.styles.inlineCritical = false;
+
   const browserTargetRun = await context.scheduleTarget(browserTarget, {
     watch: false,
     serviceWorker: false,
+    optimization: (optimization as unknown as JsonObject),
   });
   const serverTargetRun = await context.scheduleTarget(serverTarget, {
     watch: false,
   });
 
+  let spinner: Spinner | undefined;
+
   try {
     const [browserResult, serverResult] = await Promise.all([
       browserTargetRun.result as unknown as BrowserBuilderOutput,
@@ -165,8 +195,15 @@ async function _appShellBuilder(
       return serverResult;
     }
 
-    return await _renderUniversal(options, context, browserResult, serverResult);
+    spinner = new Spinner();
+    spinner.start('Generating application shell...');
+    const result = await _renderUniversal(options, context, browserResult, serverResult, spinner);
+    spinner.succeed('Application shell generation complete.');
+
+    return result;
   } catch (err) {
+    spinner?.fail('Application shell generation failed.');
+
     return { success: false, error: err.message };
   } finally {
     // Just be good citizens and stop those jobs.
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 b89b795265ab..3adcc32a7521 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/schema.json
+++ b/packages/angular_devkit/build_angular/src/app-shell/schema.json
@@ -6,12 +6,12 @@
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "Target to build.",
+      "description": "A browser builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "serverTarget": {
       "type": "string",
-      "description": "Server target to use for rendering the app shell.",
+      "description": "A server builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "appModuleBundle": {
diff --git a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
new file mode 100644
index 000000000000..fe265e4d3b23
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
+// Alternative approach instead of https://github.com/angular/angular/pull/33226
+declare module '@babel/core' {
+  export * from '@types/babel__core';
+}
+declare module '@babel/generator' {
+  export { default } from '@types/babel__generator';
+}
+declare module '@babel/traverse' {
+  export { default } from '@types/babel__traverse';
+}
+declare module '@babel/template' {
+  export { default } from '@types/babel__template';
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/babel-loader.d.ts b/packages/angular_devkit/build_angular/src/babel/babel-loader.d.ts
new file mode 100644
index 000000000000..1bc5380f631f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/babel-loader.d.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+declare module 'babel-loader' {
+  type BabelLoaderCustomizer<T> = (
+    babel: typeof import('@babel/core'),
+  ) => {
+    customOptions?(
+      this: import('webpack').loader.LoaderContext,
+      loaderOptions: Record<string, unknown>,
+      loaderArguments: { source: string; map?: unknown },
+    ): Promise<{ custom?: T; loader: Record<string, unknown> }>;
+    config?(
+      this: import('webpack').loader.LoaderContext,
+      configuration: import('@babel/core').PartialConfig,
+      loaderArguments: { source: string; map?: unknown; customOptions: T },
+    ): import('@babel/core').TransformOptions;
+  };
+  function custom<T>(customizer: BabelLoaderCustomizer<T>): import('webpack').loader.Loader;
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/presets/application.ts b/packages/angular_devkit/build_angular/src/babel/presets/application.ts
new file mode 100644
index 000000000000..98f2d67863d4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/presets/application.ts
@@ -0,0 +1,190 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 * as path from 'path';
+
+export type DiagnosticReporter = (type: 'error' | 'warning' | 'info', message: string) => void;
+export interface ApplicationPresetOptions {
+  i18n?: {
+    locale: string;
+    missingTranslationBehavior?: 'error' | 'warning' | 'ignore';
+    translation?: unknown;
+  };
+
+  angularLinker?: boolean;
+
+  forceES5?: boolean;
+  forceAsyncTransformation?: boolean;
+
+  diagnosticReporter?: DiagnosticReporter;
+}
+
+type I18nDiagnostics = import('@angular/localize/src/tools/src/diagnostics').Diagnostics;
+function createI18nDiagnostics(reporter: DiagnosticReporter | undefined): I18nDiagnostics {
+  // Babel currently is synchronous so import cannot be used
+  const diagnostics: I18nDiagnostics = new (require('@angular/localize/src/tools/src/diagnostics').Diagnostics)();
+
+  if (!reporter) {
+    return diagnostics;
+  }
+
+  const baseAdd = diagnostics.add;
+  diagnostics.add = function (type, message, ...args) {
+    if (type !== 'ignore') {
+      baseAdd.call(diagnostics, type, message, ...args);
+      reporter(type, message);
+    }
+  };
+
+  const baseError = diagnostics.error;
+  diagnostics.error = function (message, ...args) {
+    baseError.call(diagnostics, message, ...args);
+    reporter('error', message);
+  };
+
+  const baseWarn = diagnostics.warn;
+  diagnostics.warn = function (message, ...args) {
+    baseWarn.call(diagnostics, message, ...args);
+    reporter('warning', message);
+  };
+
+  const baseMerge = diagnostics.merge;
+  diagnostics.merge = function (other, ...args) {
+    baseMerge.call(diagnostics, other, ...args);
+    for (const diagnostic of other.messages) {
+      reporter(diagnostic.type, diagnostic.message);
+    }
+  };
+
+  return diagnostics;
+}
+
+function createI18nPlugins(
+  locale: string,
+  translation: unknown | undefined,
+  missingTranslationBehavior: 'error' | 'warning' | 'ignore',
+  diagnosticReporter: DiagnosticReporter | undefined,
+) {
+  const diagnostics = createI18nDiagnostics(diagnosticReporter);
+  const plugins = [];
+
+  if (translation) {
+    const {
+      makeEs2015TranslatePlugin,
+    } = require('@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin');
+    plugins.push(
+      makeEs2015TranslatePlugin(diagnostics, translation, {
+        missingTranslation: missingTranslationBehavior,
+      }),
+    );
+
+    const {
+      makeEs5TranslatePlugin,
+    } = require('@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin');
+    plugins.push(
+      makeEs5TranslatePlugin(diagnostics, translation, {
+        missingTranslation: missingTranslationBehavior,
+      }),
+    );
+  }
+
+  const {
+    makeLocalePlugin,
+  } = require('@angular/localize/src/tools/src/translate/source_files/locale_plugin');
+  plugins.push(makeLocalePlugin(locale));
+
+  return plugins;
+}
+
+function createNgtscLogger(
+  reporter: DiagnosticReporter | undefined,
+): import('@angular/compiler-cli/src/ngtsc/logging').Logger {
+  return {
+    level: 1, // Info level
+    debug(...args: string[]) {},
+    info(...args: string[]) {
+      reporter?.('info', args.join());
+    },
+    warn(...args: string[]) {
+      reporter?.('warning', args.join());
+    },
+    error(...args: string[]) {
+      reporter?.('error', args.join());
+    },
+  };
+}
+
+export default function (api: unknown, options: ApplicationPresetOptions) {
+  const presets = [];
+  const plugins = [];
+  let needRuntimeTransform = false;
+
+  if (options.angularLinker) {
+    // Babel currently is synchronous so import cannot be used
+    const {
+      createEs2015LinkerPlugin,
+    } = require('@angular/compiler-cli/linker/babel');
+
+    plugins.push(createEs2015LinkerPlugin({
+      logger: createNgtscLogger(options.diagnosticReporter),
+      fileSystem: {
+        resolve: path.resolve,
+        exists: fs.existsSync,
+        dirname: path.dirname,
+        relative: path.relative,
+        readFile: fs.readFileSync,
+      },
+    }));
+  }
+
+  if (options.forceES5) {
+    presets.push([
+      require('@babel/preset-env').default,
+      {
+        bugfixes: true,
+        modules: false,
+        // Comparable behavior to tsconfig target of ES5
+        targets: { ie: 9 },
+        exclude: ['transform-typeof-symbol'],
+      },
+    ]);
+    needRuntimeTransform = true;
+  }
+
+  if (options.i18n) {
+    const { locale, missingTranslationBehavior, translation } = options.i18n;
+    const i18nPlugins = createI18nPlugins(
+      locale,
+      translation,
+      missingTranslationBehavior || 'ignore',
+      options.diagnosticReporter,
+    );
+
+    plugins.push(...i18nPlugins);
+  }
+
+  if (options.forceAsyncTransformation) {
+    // Always transform async/await to support Zone.js
+    plugins.push(require('@babel/plugin-transform-async-to-generator').default);
+    needRuntimeTransform = true;
+  }
+
+  if (needRuntimeTransform) {
+    // Babel equivalent to TypeScript's `importHelpers` option
+    plugins.push([
+      require('@babel/plugin-transform-runtime').default,
+      {
+        useESModules: true,
+        version: require('@babel/runtime/package.json').version,
+        absoluteRuntime: path.dirname(require.resolve('@babel/runtime/package.json')),
+      },
+    ]);
+  }
+
+  return { presets, plugins };
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts b/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
new file mode 100644
index 000000000000..964103e89a62
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
@@ -0,0 +1,169 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { custom } from 'babel-loader';
+import { ScriptTarget } from 'typescript';
+import { ApplicationPresetOptions } from './presets/application';
+
+interface AngularCustomOptions {
+  forceAsyncTransformation: boolean;
+  forceES5: boolean;
+  shouldLink: boolean;
+  i18n: ApplicationPresetOptions['i18n'];
+}
+
+/**
+ * Cached linker check utility function
+ *
+ * If undefined, not yet been imported
+ * If null, attempted import failed and no linker support
+ * If function, import succeeded and linker supported
+ */
+let needsLinking: undefined | null | typeof import('@angular/compiler-cli/linker').needsLinking;
+
+async function checkLinking(
+  path: string,
+  source: string,
+): Promise<{ hasLinkerSupport?: boolean; requiresLinking: boolean }> {
+  // @angular/core and @angular/compiler will cause false positives
+  // Also, TypeScript files do not require linking
+  if (/[\\\/]@angular[\\\/](?:compiler|core)|\.tsx?$/.test(path)) {
+    return { requiresLinking: false };
+  }
+
+  if (needsLinking !== null) {
+    try {
+      if (needsLinking === undefined) {
+        needsLinking = (await import('@angular/compiler-cli/linker')).needsLinking;
+      }
+
+      // If the linker entry point is present then there is linker support
+      return { hasLinkerSupport: true, requiresLinking: needsLinking(path, source) };
+    } catch {
+      needsLinking = null;
+    }
+  }
+
+  // Fallback for Angular versions less than 11.1.0 with no linker support.
+  // This information is used to issue errors if a partially compiled library is used when unsupported.
+  return {
+    hasLinkerSupport: false,
+    requiresLinking:
+      source.includes('ɵɵngDeclareDirective') || source.includes('ɵɵngDeclareComponent'),
+  };
+}
+
+export default custom<AngularCustomOptions>(() => {
+  const baseOptions = Object.freeze({
+    babelrc: false,
+    configFile: false,
+    compact: false,
+    cacheCompression: false,
+    sourceType: 'unambiguous',
+    inputSourceMap: false,
+  });
+
+  return {
+    async customOptions({ i18n, scriptTarget, ...rawOptions }, { source }) {
+      // Must process file if plugins are added
+      let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
+
+      const customOptions: AngularCustomOptions = {
+        forceAsyncTransformation: false,
+        forceES5: false,
+        shouldLink: false,
+        i18n: undefined,
+      };
+
+      // Analyze file for linking
+      const { hasLinkerSupport, requiresLinking } = await checkLinking(this.resourcePath, source);
+      if (requiresLinking && !hasLinkerSupport) {
+        // Cannot link if there is no linker support
+        this.emitError(
+          'File requires the Angular linker. "@angular/compiler-cli" version 11.1.0 or greater is needed.',
+        );
+      } else {
+        customOptions.shouldLink = requiresLinking;
+      }
+      shouldProcess ||= customOptions.shouldLink;
+
+      // Analyze for ES target processing
+      const esTarget = scriptTarget as ScriptTarget | undefined;
+      if (esTarget !== undefined) {
+        if (esTarget < ScriptTarget.ES2015) {
+          // TypeScript files will have already been downlevelled
+          customOptions.forceES5 = !/\.tsx?$/.test(this.resourcePath);
+        } else if (esTarget >= ScriptTarget.ES2017) {
+          customOptions.forceAsyncTransformation = !/[\\\/]fesm2015[\\\/]/.test(this.resourcePath) && source.includes('async');
+        }
+        shouldProcess ||= customOptions.forceAsyncTransformation || customOptions.forceES5;
+      }
+
+      // Analyze for i18n inlining
+      if (
+        i18n &&
+        !/[\\\/]@angular[\\\/](?:compiler|localize)/.test(this.resourcePath) &&
+        source.includes('$localize')
+      ) {
+        customOptions.i18n = i18n as ApplicationPresetOptions['i18n'];
+        shouldProcess = true;
+      }
+
+      // Add provided loader options to default base options
+      const loaderOptions: Record<string, unknown> = {
+        ...baseOptions,
+        ...rawOptions,
+        cacheIdentifier: JSON.stringify({
+          buildAngular: require('../../package.json').version,
+          customOptions,
+          baseOptions,
+          rawOptions,
+        }),
+      };
+
+      // Skip babel processing if no actions are needed
+      if (!shouldProcess) {
+        // Force the current file to be ignored
+        loaderOptions.ignore = [() => true];
+      }
+
+      return { custom: customOptions, loader: loaderOptions };
+    },
+    config(configuration, { customOptions }) {
+      return {
+        ...configuration.options,
+        // Workaround for https://github.com/babel/babel-loader/pull/896 is available
+        // Delete once the above PR is released
+        inputSourceMap: (configuration.options.inputSourceMap || false as {}), // Typings are not correct
+        presets: [
+          ...(configuration.options.presets || []),
+          [
+            require('./presets/application').default,
+            {
+              angularLinker: customOptions.shouldLink,
+              forceES5: customOptions.forceES5,
+              forceAsyncTransformation: customOptions.forceAsyncTransformation,
+              i18n: customOptions.i18n,
+              diagnosticReporter: (type, message) => {
+                switch (type) {
+                  case 'error':
+                    this.emitError(message);
+                    break;
+                  case 'info':
+                  // Webpack does not currently have an informational diagnostic
+                  case 'warning':
+                    this.emitWarning(message);
+                    break;
+                }
+              },
+            } as ApplicationPresetOptions,
+          ],
+        ],
+      };
+    },
+  };
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index f71185d4644b..f406a666fa4c 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -1,16 +1,14 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { EmittedFiles, WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
-import { getSystemPath, json, normalize, resolve, tags, virtualFs } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { getSystemPath, json, normalize, resolve, tags } from '@angular-devkit/core';
 import * as fs from 'fs';
-import * as ora from 'ora';
 import * as path from 'path';
 import { Observable, from } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
@@ -19,7 +17,6 @@ import * as webpack from 'webpack';
 import { ExecutionTransformer } from '../transforms';
 import {
   BuildBrowserFeatures,
-  NormalizedBrowserBuilderSchema,
   deleteOutputDir,
   normalizeAssetPatterns,
   normalizeOptimization,
@@ -33,14 +30,13 @@ import { findCachePath } from '../utils/cache-path';
 import { colors } from '../utils/color';
 import { copyAssets } from '../utils/copy-assets';
 import { cachingDisabled } from '../utils/environment-options';
+import { mkdir, writeFile } from '../utils/fs';
 import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
 import { I18nOptions } from '../utils/i18n-options';
-import { getHtmlTransforms } from '../utils/index-file/transforms';
-import {
-  IndexHtmlTransform,
-  writeIndexHtml,
-} from '../utils/index-file/write-index-html';
+import { FileInfo } from '../utils/index-file/augment-index-html';
+import { IndexHtmlGenerator, IndexHtmlTransform } from '../utils/index-file/index-html-generator';
 import { ensureOutputPaths } from '../utils/output-paths';
+import { generateEntryPoints } from '../utils/package-chunk-sort';
 import {
   InlineOptions,
   ProcessBundleFile,
@@ -49,14 +45,13 @@ import {
 } from '../utils/process-bundle';
 import { readTsconfig } from '../utils/read-tsconfig';
 import { augmentAppWithServiceWorker } from '../utils/service-worker';
+import { Spinner } from '../utils/spinner';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import {
-  BrowserWebpackConfigOptions,
   generateI18nBrowserWebpackConfigFromContext,
   getIndexInputFile,
   getIndexOutputFile,
 } from '../utils/webpack-browser-config';
-import { isWebpackFiveOrHigher } from '../utils/webpack-version';
 import {
   getAotConfig,
   getBrowserConfig,
@@ -65,20 +60,19 @@ import {
   getStatsConfig,
   getStylesConfig,
   getWorkerConfig,
-  normalizeExtraEntryPoints,
 } from '../webpack/configs';
 import { NgBuildAnalyticsPlugin } from '../webpack/plugins/analytics';
 import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
+import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 import {
   BundleStats,
-  createWebpackLoggingCallback,
-  generateBuildStats,
-  generateBuildStatsTable,
+  ChunkType,
   generateBundleStats,
   statsErrorsToString,
   statsHasErrors,
   statsHasWarnings,
   statsWarningsToString,
+  webpackStatsLogger,
 } from '../webpack/utils/stats';
 import { Schema as BrowserBuilderSchema } from './schema';
 
@@ -94,40 +88,7 @@ export type BrowserBuilderOutput = json.JsonObject &
     outputPath: string;
   };
 
-// todo: the below should be cleaned once dev-server support the new i18n
-interface ConfigFromContextReturn {
-  config: webpack.Configuration;
-  projectRoot: string;
-  projectSourceRoot?: string;
-  i18n: I18nOptions;
-}
-
-export async function buildBrowserWebpackConfigFromContext(
-  options: BrowserBuilderSchema,
-  context: BuilderContext,
-  host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
-  extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
-): Promise<ConfigFromContextReturn> {
-  const webpackPartialGenerator = (wco: BrowserWebpackConfigOptions) => [
-    getCommonConfig(wco),
-    getBrowserConfig(wco),
-    getStylesConfig(wco),
-    getStatsConfig(wco),
-    getAnalyticsConfig(wco, context),
-    getCompilerConfig(wco),
-    wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
-  ];
-
-  return generateI18nBrowserWebpackConfigFromContext(
-    options,
-    context,
-    webpackPartialGenerator,
-    host,
-    extraBuildOptions,
-  );
-}
-
-function getAnalyticsConfig(
+export function getAnalyticsConfig(
   wco: WebpackConfigOptions,
   context: BuilderContext,
 ): webpack.Configuration {
@@ -154,7 +115,7 @@ function getAnalyticsConfig(
   return {};
 }
 
-function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
+export function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
   if (wco.buildOptions.main || wco.buildOptions.polyfills) {
     return wco.buildOptions.aot ? getAotConfig(wco) : getNonAotConfig(wco);
   }
@@ -165,8 +126,7 @@ function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
 async function initialize(
   options: BrowserBuilderSchema,
   context: BuilderContext,
-  host: virtualFs.Host<fs.Stats>,
-  differentialLoadingMode: boolean,
+  differentialLoadingNeeded: boolean,
   webpackConfigurationTransform?: ExecutionTransformer<webpack.Configuration>,
 ): Promise<{
   config: webpack.Configuration;
@@ -179,27 +139,30 @@ async function initialize(
   // Assets are processed directly by the builder except when watching
   const adjustedOptions = options.watch ? options : { ...options, assets: [] };
 
-  // TODO_WEBPACK_5: Investigate build/serve issues with the `license-webpack-plugin` package
-  if (adjustedOptions.extractLicenses && isWebpackFiveOrHigher()) {
-    adjustedOptions.extractLicenses = false;
-    context.logger.warn(
-      'Warning: License extraction is currently disabled when using Webpack 5. ' +
-        'This is temporary and will be corrected in a future update.',
-    );
-  }
-
   const {
     config,
     projectRoot,
     projectSourceRoot,
     i18n,
-  } = await buildBrowserWebpackConfigFromContext(adjustedOptions, context, host, { differentialLoadingMode });
+  } = await generateI18nBrowserWebpackConfigFromContext(
+    adjustedOptions,
+    context,
+    wco => [
+      getCommonConfig(wco),
+      getBrowserConfig(wco),
+      getStylesConfig(wco),
+      getStatsConfig(wco),
+      getAnalyticsConfig(wco, context),
+      getCompilerConfig(wco),
+      wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
+    ],
+    { differentialLoadingNeeded },
+  );
 
   // Validate asset option values if processed directly
   if (options.assets?.length && !adjustedOptions.assets?.length) {
     normalizeAssetPatterns(
       options.assets,
-      new virtualFs.SyncDelegateHost(host),
       normalize(context.workspaceRoot),
       normalize(projectRoot),
       projectSourceRoot === undefined ? undefined : normalize(projectSourceRoot),
@@ -232,7 +195,6 @@ export function buildWebpackBrowser(
     indexHtml?: IndexHtmlTransform;
   } = {},
 ): Observable<BrowserBuilderOutput> {
-  const host = new NodeJsSyncHost();
   const root = normalize(context.workspaceRoot);
 
   const projectName = context.target?.project;
@@ -251,14 +213,13 @@ export function buildWebpackBrowser(
       switchMap(async projectMetadata => {
         const sysProjectRoot = getSystemPath(
           resolve(normalize(context.workspaceRoot),
-          normalize((projectMetadata.root as string) ?? '')),
+            normalize((projectMetadata.root as string) ?? '')),
         );
 
         const { options: compilerOptions } = readTsconfig(options.tsConfig, context.workspaceRoot);
         const target = compilerOptions.target || ScriptTarget.ES5;
         const buildBrowserFeatures = new BuildBrowserFeatures(sysProjectRoot);
         const isDifferentialLoadingNeeded = buildBrowserFeatures.isDifferentialLoadingNeeded(target);
-        const differentialLoadingMode = !options.watch && isDifferentialLoadingNeeded;
 
         if (target > ScriptTarget.ES2015 && isDifferentialLoadingNeeded) {
           context.logger.warn(tags.stripIndent`
@@ -275,14 +236,14 @@ export function buildWebpackBrowser(
             (hasIE9 ? 'IE 9' + (hasIE10 ? ' & ' : '') : '') + (hasIE10 ? 'IE 10' : '');
           context.logger.warn(
             `Warning: Support was requested for ${browsers} in the project's browserslist configuration. ` +
-              (hasIE9 && hasIE10 ? 'These browsers are' : 'This browser is') +
-              ' no longer officially supported with Angular v11 and higher.' +
-              '\nFor additional information: https://v10.angular.io/guide/deprecations#ie-9-10-and-mobile',
+            (hasIE9 && hasIE10 ? 'These browsers are' : 'This browser is') +
+            ' no longer officially supported with Angular v11 and higher.' +
+            '\nFor additional information: https://v10.angular.io/guide/deprecations#ie-9-10-and-mobile',
           );
         }
 
         return {
-          ...(await initialize(options, context, host, differentialLoadingMode, transforms.webpackConfiguration)),
+          ...(await initialize(options, context, isDifferentialLoadingNeeded, transforms.webpackConfiguration)),
           buildBrowserFeatures,
           isDifferentialLoadingNeeded,
           target,
@@ -290,39 +251,40 @@ export function buildWebpackBrowser(
       }),
       // tslint:disable-next-line: no-big-function
       switchMap(({ config, projectRoot, projectSourceRoot, i18n, buildBrowserFeatures, isDifferentialLoadingNeeded, target }) => {
-        const useBundleDownleveling = isDifferentialLoadingNeeded && !options.watch;
-        const startTime = Date.now();
         const normalizedOptimization = normalizeOptimization(options.optimization);
-        const indexTransforms = getHtmlTransforms(
-          normalizedOptimization,
-          buildBrowserFeatures,
-          transforms.indexHtml,
-        );
 
         return runWebpack(config, context, {
           webpackFactory: require('webpack') as typeof webpack,
-          logging:
-            transforms.logging ||
-            (useBundleDownleveling
-              ? () => { }
-              : createWebpackLoggingCallback(!!options.verbose, context.logger)),
+          logging: transforms.logging || (
+            (stats, config) => {
+              if (options.verbose) {
+                context.logger.info(stats.toString(config.stats));
+              }
+            }
+          ),
         }).pipe(
           // tslint:disable-next-line: no-big-function
           concatMap(async buildEvent => {
+            const spinner = new Spinner();
+            spinner.enabled = options.progress !== false;
+
             const { webpackStats: webpackRawStats, success, emittedFiles = [] } = buildEvent;
             if (!webpackRawStats) {
               throw new Error('Webpack stats build result is required.');
             }
 
             // Fix incorrectly set `initial` value on chunks.
-            const extraEntryPoints = normalizeExtraEntryPoints(options.styles || [], 'styles')
-              .concat(normalizeExtraEntryPoints(options.scripts || [], 'scripts'));
+            const extraEntryPoints = [
+              ...normalizeExtraEntryPoints(options.styles || [], 'styles'),
+              ...normalizeExtraEntryPoints(options.scripts || [], 'scripts'),
+            ];
+
             const webpackStats = {
               ...webpackRawStats,
               chunks: markAsyncChunksNonInitial(webpackRawStats, extraEntryPoints),
             };
 
-            if (!success && useBundleDownleveling) {
+            if (!success) {
               // If using bundle downleveling then there is only one build
               // If it fails show any diagnostic messages and bail
               if (statsHasWarnings(webpackStats)) {
@@ -333,7 +295,9 @@ export function buildWebpackBrowser(
               }
 
               return { success };
-            } else if (success) {
+            } else {
+              const processResults: ProcessBundleResult[] = [];
+              const bundleInfoStats: BundleStats[] = [];
               outputPaths = ensureOutputPaths(baseOutputPath, i18n);
 
               let noModuleFiles: EmittedFiles[] | undefined;
@@ -482,7 +446,6 @@ export function buildWebpackBrowser(
 
                 const processActions: typeof actions = [];
                 let processRuntimeAction: ProcessBundleOptions | undefined;
-                const processResults: ProcessBundleResult[] = [];
                 for (const action of actions) {
                   // If SRI is enabled always process the runtime bundle
                   // Lazy route integrity values are stored in the runtime bundle
@@ -500,7 +463,7 @@ export function buildWebpackBrowser(
 
                 // Execute the bundle processing actions
                 try {
-                  const dlSpinner = ora('Generating ES5 bundles for differential loading...').start();
+                  spinner.start('Generating ES5 bundles for differential loading...');
                   for await (const result of executor.processAll(processActions)) {
                     processResults.push(result);
                   }
@@ -517,11 +480,10 @@ export function buildWebpackBrowser(
                     );
                   }
 
-                  dlSpinner.succeed('ES5 bundle generation complete.');
+                  spinner.succeed('ES5 bundle generation complete.');
 
                   if (i18n.shouldInline) {
-                    const spinner = ora('Generating localized bundles...').start();
-
+                    spinner.start('Generating localized bundles...');
                     const inlineActions: InlineOptions[] = [];
                     const processedFiles = new Set<string>();
                     for (const result of processResults) {
@@ -599,13 +561,13 @@ export function buildWebpackBrowser(
                         '',
                       );
                     } catch (err) {
-                      spinner.fail(colors.redBright('Localized bundle generation failed.'));
+                      spinner.fail('Localized bundle generation failed.');
 
                       return { success: false, error: mapErrorToMessage(err) };
                     }
 
                     if (hasErrors) {
-                      spinner.fail(colors.redBright('Localized bundle generation failed.'));
+                      spinner.fail('Localized bundle generation failed.');
                     } else {
                       spinner.succeed('Localized bundle generation complete.');
                     }
@@ -617,35 +579,15 @@ export function buildWebpackBrowser(
                 } finally {
                   executor.stop();
                 }
-
-                type ArrayElement<A> = A extends ReadonlyArray<infer T> ? T : never;
-                function generateBundleInfoStats(
-                  bundle: ProcessBundleFile,
-                  chunk: ArrayElement<webpack.Stats.ToJsonOutput['chunks']> | undefined,
-                ): BundleStats {
-                  return generateBundleStats(
-                    {
-                      size: bundle.size,
-                      files: bundle.map ? [bundle.filename, bundle.map.filename] : [bundle.filename],
-                      names: chunk?.names,
-                      entry: !!chunk?.names.includes('runtime'),
-                      initial: !!chunk?.initial,
-                      rendered: true,
-                    },
-                    true,
-                  );
-                }
-
-                const bundleInfoStats: BundleStats[] = [];
                 for (const result of processResults) {
                   const chunk = webpackStats.chunks?.find((chunk) => chunk.id.toString() === result.name);
 
                   if (result.original) {
-                    bundleInfoStats.push(generateBundleInfoStats(result.original, chunk));
+                    bundleInfoStats.push(generateBundleInfoStats(result.original, chunk, 'modern'));
                   }
 
                   if (result.downlevel) {
-                    bundleInfoStats.push(generateBundleInfoStats(result.downlevel, chunk));
+                    bundleInfoStats.push(generateBundleInfoStats(result.downlevel, chunk, 'legacy'));
                   }
                 }
 
@@ -654,43 +596,7 @@ export function buildWebpackBrowser(
                 ) || [];
                 for (const chunk of unprocessedChunks) {
                   const asset = webpackStats.assets?.find(a => a.name === chunk.files[0]);
-                  bundleInfoStats.push(generateBundleStats({ ...chunk, size: asset?.size }, true));
-                }
-
-                context.logger.info(
-                  '\n' +
-                  generateBuildStatsTable(bundleInfoStats, colors.enabled) +
-                  '\n\n' +
-                  generateBuildStats(
-                    webpackStats?.hash || '<unknown>',
-                    Date.now() - startTime,
-                    true,
-                  ),
-                );
-
-                // Check for budget errors and display them to the user.
-                const budgets = options.budgets || [];
-                const budgetFailures = checkBudgets(budgets, webpackStats, processResults);
-                for (const { severity, message } of budgetFailures) {
-                  switch (severity) {
-                    case ThresholdSeverity.Warning:
-                      webpackStats.warnings.push(message);
-                      break;
-                    case ThresholdSeverity.Error:
-                      webpackStats.errors.push(message);
-                      break;
-                    default:
-                      assertNever(severity);
-                  }
-                }
-
-                if (statsHasWarnings(webpackStats)) {
-                  context.logger.warn(statsWarningsToString(webpackStats, { colors: true }));
-                }
-                if (statsHasErrors(webpackStats)) {
-                  context.logger.error(statsErrorsToString(webpackStats, { colors: true }));
-
-                  return { success: false };
+                  bundleInfoStats.push(generateBundleStats({ ...chunk, size: asset?.size }));
                 }
               } else {
                 files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
@@ -714,72 +620,126 @@ export function buildWebpackBrowser(
                 }
               }
 
-              // Copy assets
-              if (!options.watch && options.assets?.length) {
-                try {
-                  await copyAssets(
-                    normalizeAssetPatterns(
-                      options.assets,
-                      new virtualFs.SyncDelegateHost(host),
-                      root,
-                      normalize(projectRoot),
-                      projectSourceRoot === undefined ? undefined : normalize(projectSourceRoot),
-                    ),
-                    Array.from(outputPaths.values()),
-                    context.workspaceRoot,
-                  );
-                } catch (err) {
-                  return { success: false, error: 'Unable to copy assets: ' + err.message };
+              // Check for budget errors and display them to the user.
+              const budgets = options.budgets;
+              if (budgets?.length) {
+                const budgetFailures = checkBudgets(budgets, webpackStats, processResults);
+                for (const { severity, message } of budgetFailures) {
+                  switch (severity) {
+                    case ThresholdSeverity.Warning:
+                      webpackStats.warnings.push(message);
+                      break;
+                    case ThresholdSeverity.Error:
+                      webpackStats.errors.push(message);
+                      break;
+                    default:
+                      assertNever(severity);
+                  }
                 }
               }
 
-              for (const [locale, outputPath] of outputPaths.entries()) {
-                let localeBaseHref;
-                if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-                  localeBaseHref = urlJoin(
-                    options.baseHref || '',
-                    i18n.locales[locale].baseHref ?? `/${locale}/`,
-                  );
+              const buildSuccess = success && !statsHasErrors(webpackStats);
+              if (buildSuccess) {
+                // Copy assets
+                if (!options.watch && options.assets?.length) {
+                  spinner.start('Copying assets...');
+                  try {
+                    await copyAssets(
+                      normalizeAssetPatterns(
+                        options.assets,
+                        root,
+                        normalize(projectRoot),
+                        projectSourceRoot === undefined ? undefined : normalize(projectSourceRoot),
+                      ),
+                      Array.from(outputPaths.values()),
+                      context.workspaceRoot,
+                    );
+                    spinner.succeed('Copying assets complete.');
+                  } catch (err) {
+                    spinner.fail(colors.redBright('Copying of assets failed.'));
+
+                    return { success: false, error: 'Unable to copy assets: ' + err.message };
+                  }
                 }
 
-                try {
-                  if (options.index) {
-                    await writeIndexHtml({
-                      host,
-                      outputPath: path.join(outputPath, getIndexOutputFile(options)),
-                      indexPath: path.join(context.workspaceRoot, getIndexInputFile(options)),
-                      files,
-                      noModuleFiles,
-                      moduleFiles,
-                      baseHref: localeBaseHref || options.baseHref,
-                      deployUrl: options.deployUrl,
-                      sri: options.subresourceIntegrity,
-                      scripts: options.scripts,
-                      styles: options.styles,
-                      postTransforms: indexTransforms,
-                      crossOrigin: options.crossOrigin,
-                      // i18nLocale is used when Ivy is disabled
-                      lang: locale || options.i18nLocale,
-                    });
+                if (options.index) {
+                  spinner.start('Generating index html...');
+
+                  const WOFFSupportNeeded = !buildBrowserFeatures.isFeatureSupported('woff2');
+                  const entrypoints = generateEntryPoints({
+                    scripts: options.scripts ?? [],
+                    styles: options.styles ?? [],
+                  });
+
+                  const indexHtmlGenerator = new IndexHtmlGenerator({
+                    indexPath: path.join(context.workspaceRoot, getIndexInputFile(options.index)),
+                    entrypoints,
+                    deployUrl: options.deployUrl,
+                    sri: options.subresourceIntegrity,
+                    WOFFSupportNeeded,
+                    optimization: normalizedOptimization,
+                    crossOrigin: options.crossOrigin,
+                    postTransform: transforms.indexHtml,
+                  });
+
+                  for (const [locale, outputPath] of outputPaths.entries()) {
+                    try {
+                      const { content, warnings, errors } = await indexHtmlGenerator.process({
+                        baseHref: getLocaleBaseHref(i18n, locale) || options.baseHref,
+                        // i18nLocale is used when Ivy is disabled
+                        lang: locale || options.i18nLocale,
+                        outputPath,
+                        files: mapEmittedFilesToFileInfo(files),
+                        noModuleFiles: mapEmittedFilesToFileInfo(noModuleFiles),
+                        moduleFiles: mapEmittedFilesToFileInfo(moduleFiles),
+                      });
+
+                      if (warnings.length || errors.length) {
+                        spinner.stop();
+                        warnings.forEach(m => context.logger.warn(m));
+                        errors.forEach(m => context.logger.error(m));
+                        spinner.start();
+                      }
+
+                      const indexOutput = path.join(outputPath, getIndexOutputFile(options.index));
+                      await mkdir(path.dirname(indexOutput), { recursive: true });
+                      await writeFile(indexOutput, content);
+                    } catch (error) {
+                      spinner.fail('Index html generation failed.');
+
+                      return { success: false, error: mapErrorToMessage(error) };
+                    }
                   }
 
-                  if (options.serviceWorker) {
-                    await augmentAppWithServiceWorker(
-                      host,
-                      root,
-                      normalize(projectRoot),
-                      normalize(outputPath),
-                      localeBaseHref || options.baseHref || '/',
-                      options.ngswConfigPath,
-                    );
+                  spinner.succeed('Index html generation complete.');
+                }
+
+                if (options.serviceWorker) {
+                  spinner.start('Generating service worker...');
+                  for (const [locale, outputPath] of outputPaths.entries()) {
+                    try {
+                      await augmentAppWithServiceWorker(
+                        root,
+                        normalize(projectRoot),
+                        normalize(outputPath),
+                        getLocaleBaseHref(i18n, locale) || options.baseHref || '/',
+                        options.ngswConfigPath,
+                      );
+                    } catch (error) {
+                      spinner.fail('Service worker generation failed.');
+
+                      return { success: false, error: mapErrorToMessage(error) };
+                    }
                   }
-                } catch (err) {
-                  return { success: false, error: mapErrorToMessage(err) };
+
+                  spinner.succeed('Service worker generation complete.');
                 }
               }
-            }
 
-            return { success };
+              webpackStatsLogger(context.logger, webpackStats, config, bundleInfoStats);
+
+              return { success: buildSuccess };
+            }
           }),
           map(
             event =>
@@ -791,8 +751,19 @@ export function buildWebpackBrowser(
               } as BrowserBuilderOutput),
           ),
         );
-    }),
-  );
+      }),
+    );
+
+  function getLocaleBaseHref(i18n: I18nOptions, locale: string): string | undefined {
+    if (i18n.locales[locale] && i18n.locales[locale]?.baseHref !== '') {
+      return urlJoin(
+        options.baseHref || '',
+        i18n.locales[locale].baseHref ?? `/${locale}/`,
+      );
+    }
+
+    return undefined;
+  }
 }
 
 function mapErrorToMessage(error: unknown): string | undefined {
@@ -808,8 +779,37 @@ function mapErrorToMessage(error: unknown): string | undefined {
 }
 
 function assertNever(input: never): never {
-  throw new Error(`Unexpected call to assertNever() with input: ${
-      JSON.stringify(input, null /* replacer */, 4 /* tabSize */)}`);
+  throw new Error(`Unexpected call to assertNever() with input: ${JSON.stringify(input, null /* replacer */, 4 /* tabSize */)}`);
+}
+
+type ArrayElement<A> = A extends ReadonlyArray<infer T> ? T : never;
+function generateBundleInfoStats(
+  bundle: ProcessBundleFile,
+  chunk: ArrayElement<webpack.Stats.ToJsonOutput['chunks']> | undefined,
+  chunkType: ChunkType,
+): BundleStats {
+  return generateBundleStats(
+    {
+      size: bundle.size,
+      files: bundle.map ? [bundle.filename, bundle.map.filename] : [bundle.filename],
+      names: chunk?.names,
+      entry: !!chunk?.names.includes('runtime'),
+      initial: !!chunk?.initial,
+      rendered: true,
+      chunkType,
+    },
+  );
+}
+
+function mapEmittedFilesToFileInfo(files: EmittedFiles[] = []): FileInfo[] {
+  const filteredFiles: FileInfo[] = [];
+  for (const { file, name, extension, initial } of files) {
+    if (name && initial) {
+      filteredFiles.push({ file, extension, name });
+    }
+  }
+
+  return filteredFiles;
 }
 
 export default createBuilder<json.JsonObject & BrowserBuilderSchema>(buildWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 628b5dcd8dd8..ef16e332d1a3 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -57,7 +57,7 @@
       "additionalProperties": false
     },
     "optimization": {
-      "description": "Enables optimization of the build output.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
       "x-user-analytics": 16,
       "default": false,
       "oneOf": [
@@ -70,12 +70,32 @@
               "default": true
             },
             "styles": {
-              "type": "boolean",
               "description": "Enables optimization of the styles output.",
-              "default": true
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "minify": {
+                      "type": "boolean",
+                      "description": "Minify CSS definitions by removing extraneous whitespace and comments, merging identifiers and minimizing values.",
+                      "default": true
+                    },
+                    "inlineCritical": {
+                      "type": "boolean",
+                      "description": "Extract and inline critical CSS definitions to improve first paint time.",
+                      "default": false
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "fonts": {
-              "description": "Enables optimization for fonts. This requires internet access.",
+              "description": "Enables optimization for fonts. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
               "default": true,
               "oneOf": [
                 {
@@ -83,7 +103,7 @@
                   "properties": {
                     "inline": {
                       "type": "boolean",
-                      "description": "Reduce render blocking requests by inlining external fonts in the application's HTML index file. This requires internet access.",
+                      "description": "Reduce render blocking requests by inlining external Google fonts and icons CSS definitions in the application's HTML index file. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
                       "default": true
                     }
                   },
@@ -126,7 +146,7 @@
       "default": false
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
       "default": true,
       "oneOf": [
         {
@@ -134,22 +154,22 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },
@@ -162,12 +182,12 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Use a separate bundle containing only vendor libraries.",
+      "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
       "default": true
     },
     "commonChunk": {
       "type": "boolean",
-      "description": "Use a separate bundle containing code used across multiple bundles.",
+      "description": "Generate a seperate bundle containing code used across multiple bundles.",
       "default": true
     },
     "baseHref": {
@@ -185,7 +205,8 @@
     },
     "progress": {
       "type": "boolean",
-      "description": "Log progress to the console while building."
+      "description": "Log progress to the console while building.",
+      "default": true
     },
     "i18nFile": {
       "type": "string",
@@ -209,6 +230,7 @@
       "default": "warning"
     },
     "localize": {
+      "description": "Translate the bundles in one or more locales.",
       "oneOf": [
         {
           "type": "boolean",
@@ -348,12 +370,6 @@
       },
       "default": []
     },
-    "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
-    },
     "webWorkerTsConfig": {
       "type": "string",
       "description": "TypeScript configuration for Web Worker modules."
@@ -395,6 +411,11 @@
         {
           "type": "object",
           "properties": {
+            "followSymlinks": {
+              "type": "boolean",
+              "default": false,
+              "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+            },
             "glob": {
               "type": "string",
               "description": "The pattern to match."
@@ -433,10 +454,12 @@
           "type": "object",
           "properties": {
             "src": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "replaceWith": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -449,10 +472,12 @@
           "type": "object",
           "properties": {
             "replace": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "with": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -474,6 +499,7 @@
             },
             "bundleName": {
               "type": "string",
+              "pattern": "^[\\w\\-.]*$",
               "description": "The bundle name for this extra entry point."
             },
             "inject": {
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts
index 0952c61b3f0a..e118ea340896 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts
index 51e855b10f71..5f6ab2a32012 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/assets_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/assets_spec.ts
index 1e2483bd4ec6..2ec91d854c14 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/assets_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/assets_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/base-href_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/base-href_spec.ts
index 5f1db812ab0d..7dcf3d1ac438 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/base-href_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/base-href_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/browser-support_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/browser-support_spec.ts
index 58ff90668a6e..f2935305cd2e 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/browser-support_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/browser-support_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/build-optimizer_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/build-optimizer_spec.ts
index e5c88b01f68e..c80d88910ff1 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/build-optimizer_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/bundle-budgets_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/bundle-budgets_spec.ts
index 3eaed7bb7d63..3016a7881c88 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/bundle-budgets_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/bundle-budgets_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -99,7 +99,6 @@ describe('Browser Builder bundle budgets', () => {
       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\.${ext}`);
       await run.stop();
     });
@@ -139,7 +138,6 @@ describe('Browser Builder bundle budgets', () => {
       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\.${ext}`);
       await run.stop();
     });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/circular-dependency_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/circular-dependency_spec.ts
index ecd710e25841..474203bb5361 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/circular-dependency_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/circular-dependency_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
deleted file mode 100644
index 9d469531a7c6..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
+++ /dev/null
@@ -1,123 +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';
-import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../test-utils';
-
-describe('Browser Builder commonjs warning', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-
-  let architect: Architect;
-  let logger: logging.Logger;
-  let logs: string[];
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-
-    // Create logger
-    logger = new logging.Logger('');
-    logs = [];
-    logger.subscribe(e => logs.push(e.message));
-  });
-
-  afterEach(async () => host.restore().toPromise());
-
-  for (const aot of [true, false]) {
-    it(`should not show warning for styles import in ${aot ? 'AOT' : 'JIT'} Mode`, async () => {
-      // Add a Common JS dependency
-      host.appendToFile('src/app/app.component.ts', `
-        import '../../test.css';
-      `);
-
-      host.writeMultipleFiles({
-        './test.css': `
-          body {
-            color: red;
-          };
-        `,
-      });
-
-      const run = await architect.scheduleTarget(targetSpec, { aot }, { logger });
-      const output = await run.result;
-      expect(output.success).toBe(true);
-      expect(logs.join()).not.toContain('Warning');
-      await run.stop();
-    });
-
-    it(`should show warning when depending on a Common JS bundle in ${aot ? 'AOT' : 'JIT'} Mode`, async () => {
-      // Add a Common JS dependency
-      host.appendToFile('src/app/app.component.ts', `
-        import 'bootstrap';
-      `);
-
-      const run = await architect.scheduleTarget(targetSpec, { aot }, { logger });
-      const output = await run.result;
-      expect(output.success).toBe(true);
-      const logMsg = logs.join();
-      expect(logMsg).toMatch(/Warning: .+app\.component\.ts depends on 'bootstrap'\. CommonJS or AMD dependencies/);
-      expect(logMsg).not.toContain('jquery', 'Should not warn on transitive CommonJS packages which parent is also CommonJS.');
-      await run.stop();
-    });
-  }
-
-  it('should not show warning when depending on a Common JS bundle which is allowed', async () => {
-    // Add a Common JS dependency
-    host.appendToFile('src/app/app.component.ts', `
-      import 'bootstrap';
-      import 'zone.js/dist/zone-error';
-    `);
-
-    const overrides = {
-      allowedCommonJsDependencies: [
-        'bootstrap',
-        'zone.js',
-      ],
-    };
-
-    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(`should not show warning when importing non global local data '@angular/common/locale/fr'`, async () => {
-    // Add a Common JS dependency
-    host.appendToFile('src/app/app.component.ts', `
-      import '@angular/common/locales/fr';
-    `);
-
-    const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(true);
-
-    expect(logs.join()).not.toContain('Warning');
-    await run.stop();
-  });
-
-  it('should not show warning in JIT for templateUrl and styleUrl when using paths', async () => {
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
-      "baseUrl": "./",
-      "paths": {
-        "@app/*": [
-          "src/app/*"
-        ]
-      },
-    `);
-
-    host.replaceInFile('src/app/app.module.ts', './app.component', '@app/app.component');
-
-    const run = await architect.scheduleTarget(targetSpec, { aot: false }, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(true);
-
-    expect(logs.join()).not.toContain('WARNING');
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/cross-origin_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/cross-origin_spec.ts
index 65f4684caf48..bf83f20cfb18 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/cross-origin_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/cross-origin_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/deploy-url_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/deploy-url_spec.ts
index 11205efaca1b..6392bc351317 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/deploy-url_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/deploy-url_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts
index 293c8d3a11b7..f8039bfe57e7 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -50,7 +50,9 @@ describe('Browser Builder with differential loading', () => {
       'runtime-es5.js.map',
 
       'vendor-es2015.js',
+      'vendor-es2015.js.map',
       'vendor-es5.js',
+      'vendor-es5.js.map',
 
       'styles.css',
       'styles.css.map',
@@ -88,7 +90,9 @@ describe('Browser Builder with differential loading', () => {
       'runtime-es5.js.map',
 
       'vendor-es2016.js',
+      'vendor-es2016.js.map',
       'vendor-es5.js',
+      'vendor-es5.js.map',
 
       'styles.css',
       'styles.css.map',
@@ -126,7 +130,9 @@ describe('Browser Builder with differential loading', () => {
       'runtime-es5.js.map',
 
       'vendor-esnext.js',
+      'vendor-esnext.js.map',
       'vendor-es5.js',
+      'vendor-es5.js.map',
 
       'styles.css',
       'styles.css.map',
@@ -142,16 +148,17 @@ describe('Browser Builder with differential loading', () => {
       'favicon.ico',
       'index.html',
 
-      'main.js',
-      'main.js.map',
+      'main-es2015.js',
+      'main-es2015.js.map',
 
-      'polyfills.js',
-      'polyfills.js.map',
+      'polyfills-es2015.js',
+      'polyfills-es2015.js.map',
 
-      'runtime.js',
-      'runtime.js.map',
+      'runtime-es2015.js',
+      'runtime-es2015.js.map',
 
-      'vendor.js',
+      'vendor-es2015.js',
+      'vendor-es2015.js.map',
 
       'styles.css',
       'styles.css.map',
@@ -195,10 +202,10 @@ describe('Browser Builder with differential loading', () => {
 
     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="vendor.js" type="module"></script>' +
-      '<script src="main.js" type="module"></script>',
+      '<script src="runtime-es2015.js" type="module"></script>' +
+      '<script src="polyfills-es2015.js" type="module"></script>' +
+      '<script src="vendor-es2015.js" type="module"></script>' +
+      '<script src="main-es2015.js" type="module"></script>',
     );
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts
index 8d9a44a36b41..67dd8d71276d 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/font-optimization_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/font-optimization_spec.ts
index 8075059db024..e448cca3a8bd 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/font-optimization_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/font-optimization_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/i18n_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/i18n_spec.ts
index 669a3bc6384c..12f6203726f1 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/i18n_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/i18n_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/index_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/index_spec.ts
index f74d864b4ab2..b8a5ecd61d49 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/index_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts
new file mode 100644
index 000000000000..7782b288d61d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { browserBuild, createArchitect, host } from '../../test-utils';
+
+describe('Browser Builder inline critical CSS optimization', () => {
+  const target = { project: 'app', target: 'build' };
+  const overrides = {
+    optimization: {
+      scripts: false,
+      styles: {
+        minify: true,
+        inlineCritical: true,
+      },
+      fonts: false,
+    },
+  };
+
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body { color: #000 }
+      `,
+    });
+  });
+
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const html = await files['index.html'];
+    expect(html).toContain(`<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`);
+    expect(html).toContain(`body{color:#000}`);
+  });
+
+  it('works with deployUrl', async () => {
+    const { files } = await browserBuild(architect, host, target, { ...overrides, deployUrl: 'http://cdn.com/' });
+    const html = await files['index.html'];
+    expect(html).toContain(`<link rel="stylesheet" href="http://cdn.com/styles.css" media="print" onload="this.media='all'">`);
+    expect(html).toContain(`body{color:#000}`);
+  });
+
+  it('should not inline critical css when option is disabled', async () => {
+    const { files } = await browserBuild(architect, host, target, { optimization: false });
+    const html = await files['index.html'];
+    expect(html).toContain(`<link rel="stylesheet" href="styles.css">`);
+    expect(html).not.toContain(`body{color:#000}`);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts
index ffb07abf2026..b00f7796e1c4 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { TestProjectHost } from '@angular-devkit/architect/testing';
 import { logging } from '@angular-devkit/core';
-import { take, tap, timeout } from 'rxjs/operators';
+import { debounceTime, take, tap } from 'rxjs/operators';
 import {
   browserBuild,
   createArchitect,
@@ -117,7 +117,7 @@ describe('Browser Builder lazy modules', () => {
       const run = await architect.scheduleTarget(target, overrides);
       await run.output
         .pipe(
-          timeout(15000),
+          debounceTime(3000),
           tap(buildEvent => {
             buildNumber++;
             switch (buildNumber) {
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/license-extraction_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/license-extraction_spec.ts
deleted file mode 100644
index 056d6449a6fd..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/specs/license-extraction_spec.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';
-import { browserBuild, createArchitect, host } from '../../test-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/src/browser/specs/no-entry-module_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/no-entry-module_spec.ts
index 705a035eb49b..d9c8dfd17a59 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/no-entry-module_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/no-entry-module_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts
index f5025f2d9dcb..7fe49602081f 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/output-hashing_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/output-hashing_spec.ts
deleted file mode 100644
index a557117f7614..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/specs/output-hashing_spec.ts
+++ /dev/null
@@ -1,193 +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';
-import { normalize } from '@angular-devkit/core';
-import {
-  browserBuild,
-  createArchitect,
-  host,
-  lazyModuleFiles,
-  lazyModuleFnImport,
-} from '../../test-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(lazyModuleFnImport);
-
-    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(lazyModuleFnImport);
-
-    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(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.
-    // '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 non injected styles', async () => {
-    const overrides = {
-      outputHashing: 'all',
-      extractCss: true,
-      styles: [{ input: 'src/styles.css', inject: false }],
-    };
-
-    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 non injected styles when optimization is enabled', async () => {
-    const overrides = {
-      outputHashing: 'all',
-      extractCss: true,
-      optimization: true,
-      styles: [{ input: 'src/styles.css', inject: false }],
-    };
-
-    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/src/browser/specs/output-path_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/output-path_spec.ts
index beb600d77adc..e27ae3fc63b2 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/output-path_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/output-path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/poll_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/poll_spec.ts
index 9f330fc759f5..8deb9abbee41 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/poll_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/poll_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts
index 9162cd0cda6b..10f209f5483b 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/replacements_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/replacements_spec.ts
index 795cbadaf918..b0adf56849fd 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/replacements_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/replacements_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts
index 373ac3419984..4eb458472e36 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/resources-output-path_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/resources-output-path_spec.ts
index fb9e0a87b6ae..b0c027bb2427 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/resources-output-path_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/resources-output-path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/rollup_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/rollup_spec.ts
index 127e406cea24..d460055302e8 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/rollup_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/rollup_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts
index 29e004bf8428..a2569242ac6b 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -81,20 +81,20 @@ describe('Browser Builder scripts array', () => {
       '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>'
+      'main-es2015.js': 'input-script',
+      'index.html': '<script src="runtime-es2015.js" type="module"></script>'
+        + '<script src="polyfills-es2015.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>',
+        + '<script src="vendor-es2015.js" type="module"></script>'
+        + '<script src="main-es2015.js" type="module"></script>',
     };
 
     host.writeMultipleFiles(scripts);
     host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
 
     // Enable differential loading
-    host.appendToFile('.browserslistrc', '\nIE 10');
+    host.appendToFile('.browserslistrc', '\nIE 11');
 
     // Remove styles so we don't have to account for them in the index.html order check.
     const { files } = await browserBuild(architect, host, target, {
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts
index 7ce6b377b740..15ca52b5d050 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/service-worker_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts
index b7ea20ef94a9..5e8981d9ac09 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/source-map_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -158,4 +158,20 @@ describe('Browser Builder source map', () => {
     expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
     expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
   });
+
+  it('should resolve sources to partial SCSS files', async () => {
+    const overrides = {
+      sourceMap: true,
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `@import './partial';`,
+      'src/_partial.scss': `p { color: red; }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css.map']).toContain('_partial.scss');
+  });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/stats-json_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/stats-json_spec.ts
index 4ef7c3a5c0b6..116828fe4bbe 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/stats-json_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/stats-json_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts
index 7da64970b00e..176b3b241df3 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -354,7 +354,7 @@ describe('Browser Builder styles', () => {
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
-  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, async () => {
+  it(`supports baseHref/deployUrl in resource urls`, 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');
@@ -458,118 +458,6 @@ describe('Browser Builder styles', () => {
     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 with full path`, async () => {
     const bootstrapPath = dirname(require.resolve('bootstrap/package.json'));
 
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/subresource-integrity_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/subresource-integrity_spec.ts
deleted file mode 100644
index 274d89889a71..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/specs/subresource-integrity_spec.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';
-import { browserBuild, createArchitect, host } from '../../test-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/src/browser/specs/svg_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/svg_spec.ts
index 3e32677c00ff..d416c7c0a2da 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/svg_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/svg_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts
index 8e31ff766798..21eeaf44ea06 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/unused-files-warning_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/unused-files-warning_spec.ts
index e8b920ab1fdc..7f62ebc53e81 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/unused-files-warning_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/unused-files-warning_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/vendor-chunk_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/vendor-chunk_spec.ts
index e78237b25186..6fe4f211fd55 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/vendor-chunk_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/vendor-chunk_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts
index 11b8fc0dc9ed..31e2124ec985 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -34,7 +34,7 @@ describe('Browser Builder external source map', () => {
     expect(hasTsSourcePaths).toBe(true, `vendor.js.map should have '.ts' extentions`);
   });
 
-  it(`does not generate 'vendor.js.map' when vendor sourcemap is disabled`, async () => {
+  it('does not map sourcemaps from external library when disabled', async () => {
     const overrides = {
       sourceMap: {
         scripts: true,
@@ -44,6 +44,8 @@ describe('Browser Builder external source map', () => {
     };
 
     const { files } = await browserBuild(architect, host, target, overrides);
-    expect(files['vendor.js.map']).toBeUndefined();
+    const sourcePaths: string[] = JSON.parse(await files['vendor.js.map']).sources;
+    const hasTsSourcePaths = sourcePaths.some(p => path.extname(p) == '.ts');
+    expect(hasTsSourcePaths).toBe(false, `vendor.js.map not should have '.ts' extentions`);
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts
index 9d8392c430ed..a9897e965889 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/works_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/works_spec.ts
index 75b2eda17272..50bbce771bef 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/works_spec.ts
@@ -1,37 +1,45 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { describeBuilder } from '../../testing';
+import { buildWebpackBrowser } from '../index';
 
-import { Architect } from '@angular-devkit/architect';
-import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../test-utils';
+const BROWSER_BUILDER_INFO = {
+  name: '@angular-devkit/build-angular:browser',
+  schemaPath: __dirname + '/../schema.json',
+};
 
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('basic test', () => {
+    it('works', async () => {
+      // Provide a target and options for builder execution
+      harness.useTarget('build', {
+        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: [],
+      });
 
-describe('Browser Builder basic test', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
+      // Execute builder with above provided project, target, and options
+      await harness.executeOnce();
 
-  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/vendor.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/favicon.ico'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/index.html'))).toBe(true);
+      // Default files should be in outputPath.
+      expect(harness.hasFile('dist/runtime.js')).toBe(true);
+      expect(harness.hasFile('dist/main.js')).toBe(true);
+      expect(harness.hasFile('dist/polyfills.js')).toBe(true);
+      expect(harness.hasFile('dist/vendor.js')).toBe(true);
+      expect(harness.hasFile('dist/favicon.ico')).toBe(true);
+      expect(harness.hasFile('dist/styles.css')).toBe(true);
+      expect(harness.hasFile('dist/index.html')).toBe(true);
+    });
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/behavior/rebuild-errors_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/behavior/rebuild-errors_spec.ts
new file mode 100644
index 000000000000..3cc82124298f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/behavior/rebuild-errors_spec.ts
@@ -0,0 +1,329 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { logging } from '@angular-devkit/core';
+import { concatMap, count, take, timeout } from 'rxjs/operators';
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Behavior: "Rebuild Error"', () => {
+
+    it('detects template errors with no AOT codegen or TS emit differences', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        aot: true,
+        watch: true,
+      });
+
+      const goodDirectiveContents = `
+        import { Directive, Input } from '@angular/core';
+        @Directive({ selector: 'dir' })
+        export class Dir {
+          @Input() foo: number;
+        }
+      `;
+
+      const typeErrorText = `Type 'number' is not assignable to type 'string'.`;
+
+      // Create a directive and add to application
+      await harness.writeFile('src/app/dir.ts', goodDirectiveContents);
+      await harness.writeFile('src/app/app.module.ts', `
+        import { NgModule } from '@angular/core';
+        import { BrowserModule } from '@angular/platform-browser';
+        import { AppComponent } from './app.component';
+        import { Dir } from './dir';
+        @NgModule({
+          declarations: [
+            AppComponent,
+            Dir,
+          ],
+          imports: [
+            BrowserModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `);
+
+      // Create app component that uses the directive
+      await harness.writeFile('src/app/app.component.ts', `
+        import { Component } from '@angular/core'
+        @Component({
+          selector: 'app-root',
+          template: '<dir [foo]="123">',
+        })
+        export class AppComponent { }
+      `);
+
+      const buildCount = await harness
+        .execute({ outputLogsOnFailure: false })
+        .pipe(
+          timeout(60000),
+          concatMap(async ({ result, logs }, index) => {
+            switch (index) {
+              case 0:
+                expect(result?.success).toBeTrue();
+
+                // Update directive to use a different input type for 'foo' (number -> string)
+                // Should cause a template error
+                await harness.writeFile('src/app/dir.ts', `
+                  import { Directive, Input } from '@angular/core';
+                  @Directive({ selector: 'dir' })
+                  export class Dir {
+                    @Input() foo: string;
+                  }
+                `);
+
+                break;
+              case 1:
+                expect(result?.success).toBeFalse();
+                expect(logs).toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Make an unrelated change to verify error cache was updated
+                // Should persist error in the next rebuild
+                await harness.modifyFile('src/main.ts', (content) => content + '\n');
+
+                break;
+              case 2:
+                expect(result?.success).toBeFalse();
+                expect(logs).toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Revert the directive change that caused the error
+                // Should remove the error
+                await harness.writeFile('src/app/dir.ts', goodDirectiveContents);
+
+                break;
+              case 3:
+                expect(result?.success).toBeTrue();
+                expect(logs).not.toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Make an unrelated change to verify error cache was updated
+                // Should continue showing no error
+                await harness.modifyFile('src/main.ts', (content) => content + '\n');
+
+                break;
+              case 4:
+                expect(result?.success).toBeTrue();
+                expect(logs).not.toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                break;
+            }
+          }),
+          take(5),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(5);
+    });
+
+    it('detects template errors with AOT codegen differences', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        aot: true,
+        watch: true,
+      });
+
+      const typeErrorText = `Type 'number' is not assignable to type 'string'.`;
+
+      // Create two directives and add to application
+      await harness.writeFile('src/app/dir.ts', `
+        import { Directive, Input } from '@angular/core';
+        @Directive({ selector: 'dir' })
+        export class Dir {
+          @Input() foo: number;
+        }
+      `);
+
+      // Same selector with a different type on the `foo` property but initially no `@Input`
+      const goodDirectiveContents = `
+        import { Directive } from '@angular/core';
+        @Directive({ selector: 'dir' })
+        export class Dir2 {
+          foo: string;
+        }
+      `;
+      await harness.writeFile('src/app/dir2.ts', goodDirectiveContents);
+
+      await harness.writeFile('src/app/app.module.ts', `
+        import { NgModule } from '@angular/core';
+        import { BrowserModule } from '@angular/platform-browser';
+        import { AppComponent } from './app.component';
+        import { Dir } from './dir';
+        import { Dir2 } from './dir2';
+        @NgModule({
+          declarations: [
+            AppComponent,
+            Dir,
+            Dir2,
+          ],
+          imports: [
+            BrowserModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `);
+
+      // Create app component that uses the directive
+      await harness.writeFile('src/app/app.component.ts', `
+        import { Component } from '@angular/core'
+        @Component({
+          selector: 'app-root',
+          template: '<dir [foo]="123">',
+        })
+        export class AppComponent { }
+      `);
+
+      const buildCount = await harness
+        .execute({ outputLogsOnFailure: false })
+        .pipe(
+          timeout(60000),
+          concatMap(async ({ result, logs }, index) => {
+            switch (index) {
+              case 0:
+                expect(result?.success).toBeTrue();
+
+                // Update second directive to use string property `foo` as an Input
+                // Should cause a template error
+                await harness.writeFile('src/app/dir2.ts', `
+                  import { Directive, Input } from '@angular/core';
+                  @Directive({ selector: 'dir' })
+                  export class Dir2 {
+                    @Input() foo: string;
+                  }
+                `);
+
+                break;
+              case 1:
+                expect(result?.success).toBeFalse();
+                expect(logs).toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Make an unrelated change to verify error cache was updated
+                // Should persist error in the next rebuild
+                await harness.modifyFile('src/main.ts', (content) => content + '\n');
+
+                break;
+              case 2:
+                expect(result?.success).toBeFalse();
+                expect(logs).toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Revert the directive change that caused the error
+                // Should remove the error
+                await harness.writeFile('src/app/dir2.ts', goodDirectiveContents);
+
+                break;
+              case 3:
+                expect(result?.success).toBeTrue();
+                expect(logs).not.toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                // Make an unrelated change to verify error cache was updated
+                // Should continue showing no error
+                await harness.modifyFile('src/main.ts', (content) => content + '\n');
+
+                break;
+              case 4:
+                expect(result?.success).toBeTrue();
+                expect(logs).not.toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching(typeErrorText),
+                  }),
+                );
+
+                break;
+            }
+          }),
+          take(5),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(5);
+    });
+
+    it('recovers from component stylesheet error', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        watch: true,
+      });
+
+      const buildCount = await harness
+        .execute({ outputLogsOnFailure: false })
+        .pipe(
+          timeout(30000),
+          concatMap(async ({ result, logs }, index) => {
+            switch (index) {
+              case 0:
+                expect(result?.success).toBeTrue();
+                await harness.writeFile('src/app/app.component.css', 'invalid-css-content');
+
+                break;
+              case 1:
+                expect(result?.success).toBeFalse();
+                expect(logs).toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching('invalid-css-content'),
+                  }),
+                );
+
+                await harness.writeFile('src/app/app.component.css', 'p { color: green }');
+
+                break;
+              case 2:
+                expect(result?.success).toBeTrue();
+                expect(logs).not.toContain(
+                  jasmine.objectContaining<logging.LogEntry>({
+                    message: jasmine.stringMatching('invalid-css-content'),
+                  }),
+                );
+
+                harness.expectFile('dist/main.js').content.toContain('p { color: green }');
+
+                break;
+            }
+          }),
+          take(3),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(3);
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/behavior/typescript-target_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/behavior/typescript-target_spec.ts
new file mode 100644
index 000000000000..b9c7ba230e08
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/behavior/typescript-target_spec.ts
@@ -0,0 +1,137 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Behavior: "TypeScript Configuration - target"', () => {
+    it('downlevels async functions when targetting ES2017', async () => {
+      // Set TypeScript configuration target to ES2017 to enable native async
+      await harness.modifyFile('src/tsconfig.app.json', (content) => {
+        const tsconfig = JSON.parse(content);
+        if (!tsconfig.compilerOptions) {
+          tsconfig.compilerOptions = {};
+        }
+        tsconfig.compilerOptions.target = 'es2017';
+
+        return JSON.stringify(tsconfig);
+      });
+
+      // Add a JavaScript file with async code
+      await harness.writeFile(
+        'src/async-test.js',
+        'async function testJs() { console.log("from-async-js-function"); }',
+      );
+
+      // Add an async function to the project as well as JavaScript file
+      await harness.modifyFile(
+        'src/main.ts',
+        (content) =>
+          'import "./async-test";\n' +
+          content +
+          `\nasync function testApp(): Promise<void> { console.log("from-async-app-function"); }`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      expect(logs).not.toContain(
+        jasmine.objectContaining({
+          message: jasmine.stringMatching('Zone.js does not support native async/await in ES2017+'),
+        }),
+      );
+
+      harness.expectFile('dist/main.js').content.not.toMatch(/\sasync\s/);
+      harness.expectFile('dist/main.js').content.toContain('"from-async-app-function"');
+      harness.expectFile('dist/main.js').content.toContain('"from-async-js-function"');
+    });
+
+    it('creates correct sourcemaps when downleveling async functions', async () => {
+      // Set TypeScript configuration target to ES2017 to enable native async
+      await harness.modifyFile('src/tsconfig.app.json', (content) => {
+        const tsconfig = JSON.parse(content);
+        if (!tsconfig.compilerOptions) {
+          tsconfig.compilerOptions = {};
+        }
+        tsconfig.compilerOptions.target = 'es2017';
+
+        return JSON.stringify(tsconfig);
+      });
+
+      // Add a JavaScript file with async code
+      await harness.writeFile(
+        'src/async-test.js',
+        'async function testJs() { console.log("from-async-js-function"); }',
+      );
+
+      // Add an async function to the project as well as JavaScript file
+      // The type `Void123` is used as a unique identifier for the final sourcemap
+      // If sourcemaps are not properly propagated then it will not be in the final sourcemap
+      await harness.modifyFile(
+        'src/main.ts',
+        (content) =>
+          'import "./async-test";\n' +
+          content +
+          '\ntype Void123 = void;' +
+          `\nasync function testApp(): Promise<Void123> { console.log("from-async-app-function"); }`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        sourceMap: {
+          scripts: true,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js').content.not.toMatch(/\sasync\s/);
+      harness.expectFile('dist/main.js.map').content.toContain('Promise<Void123>');
+    });
+
+    it('downlevels async functions when targetting greater than ES2017', async () => {
+      // Set TypeScript configuration target greater than ES2017 to enable native async
+      await harness.modifyFile('src/tsconfig.app.json', (content) => {
+        const tsconfig = JSON.parse(content);
+        if (!tsconfig.compilerOptions) {
+          tsconfig.compilerOptions = {};
+        }
+        tsconfig.compilerOptions.target = 'es2020';
+
+        return JSON.stringify(tsconfig);
+      });
+
+      // Add an async function to the project
+      await harness.writeFile(
+        'src/main.ts',
+        'async function test(): Promise<void> { console.log("from-async-function"); }',
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      expect(logs).not.toContain(
+        jasmine.objectContaining({
+          message: jasmine.stringMatching('Zone.js does not support native async/await in ES2017+'),
+        }),
+      );
+
+      harness.expectFile('dist/main.js').content.not.toMatch(/\sasync\s/);
+      harness.expectFile('dist/main.js').content.toContain('"from-async-function"');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/allowed-common-js-dependencies_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/allowed-common-js-dependencies_spec.ts
new file mode 100644
index 000000000000..8da71c1b3315
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/allowed-common-js-dependencies_spec.ts
@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
+  describe('Option: "allowedCommonJsDependencies"', () => {
+    describe('given option is not set', () => {
+      for (const aot of [true, false]) {
+        it(`should not show warning for styles import in ${aot ? 'AOT' : 'JIT'} Mode`, async () => {
+          await harness.writeFile('./test.css', `body { color: red; };`);
+          await harness.appendToFile('src/app/app.component.ts', `import '../../test.css';`);
+
+          harness.useTarget('build', {
+            ...BASE_OPTIONS,
+            allowedCommonJsDependencies: [],
+            aot,
+          });
+
+          const { result, logs } = await harness.executeOnce();
+
+          expect(result?.success).toBe(true);
+          expect(logs).not.toContain(
+            jasmine.objectContaining<logging.LogEntry>({
+              message: jasmine.stringMatching(/CommonJS or AMD dependencies/),
+            }),
+          );
+        });
+
+        it(`should show warning when depending on a Common JS bundle in ${aot ? 'AOT' : 'JIT'} Mode`, async () => {
+          // Add a Common JS dependency
+          await harness.appendToFile('src/app/app.component.ts', `import 'bootstrap';`);
+
+          harness.useTarget('build', {
+            ...BASE_OPTIONS,
+            allowedCommonJsDependencies: [],
+            aot,
+          });
+
+          const { result, logs } = await harness.executeOnce();
+
+          expect(result?.success).toBe(true);
+          expect(logs).toContain(
+            jasmine.objectContaining<logging.LogEntry>({
+              message: jasmine.stringMatching(/Warning: .+app\.component\.ts depends on 'bootstrap'\. CommonJS or AMD dependencies/),
+            }),
+          );
+          expect(logs).not.toContain(
+            jasmine.objectContaining<logging.LogEntry>({ message: jasmine.stringMatching('jquery') }),
+            'Should not warn on transitive CommonJS packages which parent is also CommonJS.',
+          );
+        });
+      }
+    });
+
+    it('should not show warning when depending on a Common JS bundle which is allowed', async () => {
+      // Add a Common JS dependency
+      await harness.appendToFile('src/app/app.component.ts', `
+        import 'bootstrap';
+        import 'zone.js/dist/zone-error';
+      `);
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        allowedCommonJsDependencies: [
+          'bootstrap',
+          'zone.js',
+        ],
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      expect(logs).not.toContain(
+        jasmine.objectContaining<logging.LogEntry>({
+          message: jasmine.stringMatching(/CommonJS or AMD dependencies/),
+        }),
+      );
+    });
+
+    it(`should not show warning when importing non global local data '@angular/common/locale/fr'`, async () => {
+      await harness.appendToFile('src/app/app.component.ts', `import '@angular/common/locales/fr';`);
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        allowedCommonJsDependencies: [],
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      expect(logs).not.toContain(
+        jasmine.objectContaining<logging.LogEntry>({
+          message: jasmine.stringMatching(/CommonJS or AMD dependencies/),
+        }),
+      );
+    });
+
+    it('should not show warning in JIT for templateUrl and styleUrl when using paths', async () => {
+      await harness.modifyFile(
+        'tsconfig.json', content => {
+          return content.replace(/"baseUrl": ".\/",/, `
+            "baseUrl": "./",
+            "paths": {
+              "@app/*": [
+                "src/app/*"
+              ]
+            },
+          `);
+        });
+
+      await harness.modifyFile(
+        'src/app/app.module.ts',
+        content => content.replace('./app.component', '@app/app.component'),
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        allowedCommonJsDependencies: [],
+        aot: false,
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      expect(logs).not.toContain(
+        jasmine.objectContaining<logging.LogEntry>({
+          message: jasmine.stringMatching(/CommonJS or AMD dependencies/),
+        }),
+      );
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/assets_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/assets_spec.ts
new file mode 100644
index 000000000000..cf9a6a97a9c1
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/assets_spec.ts
@@ -0,0 +1,394 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "assets"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for asset tests
+      await harness.writeFile('src/main.ts', '');
+    });
+
+    it('supports an empty array value', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        assets: [],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+    });
+
+    it('supports mixing shorthand and longhand syntax', async () => {
+      await harness.writeFile('src/files/test.svg', '<svg></svg>');
+      await harness.writeFile('src/files/another.file', 'asset file');
+      await harness.writeFile('src/extra.file', 'extra file');
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        assets: ['src/extra.file', { glob: '*', input: 'src/files', output: '.' }],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/extra.file').content.toBe('extra file');
+      harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      harness.expectFile('dist/another.file').content.toBe('asset file');
+    });
+
+    describe('shorthand syntax', () => {
+      it('copies a single asset', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: ['src/test.svg'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('copies multiple assets', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+        await harness.writeFile('src/another.file', 'asset file');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: ['src/test.svg', 'src/another.file'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').content.toBe('asset file');
+      });
+
+      it('copies an asset with directory and maintains directory in output', async () => {
+        await harness.writeFile('src/subdirectory/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: ['src/subdirectory/test.svg'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('does not fail if asset does not exist', async () => {
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: ['src/test.svg'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').toNotExist();
+      });
+
+      it('throws exception if asset path is not within project source root', async () => {
+        await harness.writeFile('test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: ['test.svg'],
+        });
+
+        const { result, error } = await harness.executeOnce({ outputLogsOnException: false });
+
+        expect(result).toBeUndefined();
+        expect(error).toEqual(
+          jasmine.objectContaining({
+            message: jasmine.stringMatching('path must start with the project source root'),
+          }),
+        );
+
+        harness.expectFile('dist/test.svg').toNotExist();
+      });
+    });
+
+    describe('longhand syntax', () => {
+      it('copies a single asset', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('copies multiple assets as separate entries', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+        await harness.writeFile('src/another.file', 'asset file');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [
+            { glob: 'test.svg', input: 'src', output: '.' },
+            { glob: 'another.file', input: 'src', output: '.' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').content.toBe('asset file');
+      });
+
+      it('copies multiple assets with a single entry glob pattern', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+        await harness.writeFile('src/another.file', 'asset file');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: '{test.svg,another.file}', input: 'src', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').content.toBe('asset file');
+      });
+
+      it('copies multiple assets with a wildcard glob pattern', async () => {
+        await harness.writeFile('src/files/test.svg', '<svg></svg>');
+        await harness.writeFile('src/files/another.file', 'asset file');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: '*', input: 'src/files', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').content.toBe('asset file');
+      });
+
+      it('copies multiple assets with a recursive wildcard glob pattern', async () => {
+        await harness.writeFiles({
+          'src/files/test.svg': '<svg></svg>',
+          'src/files/another.file': 'asset file',
+          'src/files/nested/extra.file': 'extra file',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: '**/*', input: 'src/files', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').content.toBe('asset file');
+        harness.expectFile('dist/nested/extra.file').content.toBe('extra file');
+      });
+
+      it('automatically ignores "." prefixed files when using wildcard glob pattern', async () => {
+        await harness.writeFile('src/files/.gitkeep', '');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: '*', input: 'src/files', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/.gitkeep').toNotExist();
+      });
+
+      it('supports ignoring a specific file when using a glob pattern', async () => {
+        await harness.writeFiles({
+          'src/files/test.svg': '<svg></svg>',
+          'src/files/another.file': 'asset file',
+          'src/files/nested/extra.file': 'extra file',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [
+            { glob: '**/*', input: 'src/files', output: '.', ignore: ['another.file'] },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').toNotExist();
+        harness.expectFile('dist/nested/extra.file').content.toBe('extra file');
+      });
+
+      it('supports ignoring with a glob pattern when using a glob pattern', async () => {
+        await harness.writeFiles({
+          'src/files/test.svg': '<svg></svg>',
+          'src/files/another.file': 'asset file',
+          'src/files/nested/extra.file': 'extra file',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [
+            { glob: '**/*', input: 'src/files', output: '.', ignore: ['**/*.file'] },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+        harness.expectFile('dist/another.file').toNotExist();
+        harness.expectFile('dist/nested/extra.file').toNotExist();
+      });
+
+      it('copies an asset with directory and maintains directory in output', async () => {
+        await harness.writeFile('src/subdirectory/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'subdirectory/test.svg', input: 'src', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('does not fail if asset does not exist', async () => {
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').toNotExist();
+      });
+
+      it('uses project output path when output option is empty string', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('uses project output path when output option is "."', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '.' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('uses project output path when output option is "/"', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '/' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('creates a project output sub-path when output option path does not exist', async () => {
+        await harness.writeFile('src/test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: 'subdirectory' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
+      });
+
+      it('throws exception if output option is not within project output path', async () => {
+        await harness.writeFile('test.svg', '<svg></svg>');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          assets: [{ glob: 'test.svg', input: 'src', output: '..' }],
+        });
+
+        const { result, error } = await harness.executeOnce({ outputLogsOnException: false });
+
+        expect(result).toBeUndefined();
+        expect(error).toEqual(
+          jasmine.objectContaining({
+            message: jasmine.stringMatching(
+              'An asset cannot be written to a location outside of the output path',
+            ),
+          }),
+        );
+
+        harness.expectFile('dist/test.svg').toNotExist();
+      });
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/extract-licenses_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/extract-licenses_spec.ts
new file mode 100644
index 000000000000..5a978435e76b
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/extract-licenses_spec.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "extractLicenses"', () => {
+    it(`should generate '3rdpartylicenses.txt' when 'extractLicenses' is true`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        extractLicenses: true,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
+    });
+
+    it(`should not generate '3rdpartylicenses.txt' when 'extractLicenses' is false`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        extractLicenses: false,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/3rdpartylicenses.txt').toNotExist();
+    });
+
+    it(`should not generate '3rdpartylicenses.txt' when 'extractLicenses' is not set`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/3rdpartylicenses.txt').toNotExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/main_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/main_spec.ts
new file mode 100644
index 000000000000..62d8d64ab3fc
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/main_spec.ts
@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "main"', () => {
+    it('uses a provided TypeScript file', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        main: 'src/main.ts',
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/runtime.js').toExist();
+      harness.expectFile('dist/main.js').toExist();
+      harness.expectFile('dist/vendor.js').toExist();
+      harness.expectFile('dist/index.html').toExist();
+    });
+
+    it('uses a provided JavaScript file', async () => {
+      await harness.writeFile('src/main.js', `console.log('main');`);
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        main: 'src/main.js',
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/runtime.js').toExist();
+      harness.expectFile('dist/main.js').toExist();
+      harness.expectFile('dist/vendor.js').toNotExist();
+      harness.expectFile('dist/index.html').toExist();
+
+      harness.expectFile('dist/main.js').content.toContain(`console.log('main')`);
+    });
+
+    it('fails and shows an error when file does not exist', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        main: 'src/missing.ts',
+      });
+
+      const { result, logs } = await harness.executeOnce({ outputLogsOnFailure: false });
+
+      expect(result?.success).toBe(false);
+      expect(logs).toContain(
+        jasmine.objectContaining({ message: jasmine.stringMatching('Module not found:') }),
+      );
+
+      harness.expectFile('dist/runtime.js').toNotExist();
+      harness.expectFile('dist/main.js').toNotExist();
+      harness.expectFile('dist/vendor.js').toNotExist();
+      harness.expectFile('dist/index.html').toNotExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/output-hashing_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/output-hashing_spec.ts
new file mode 100644
index 000000000000..14db3ee47213
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/output-hashing_spec.ts
@@ -0,0 +1,176 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { buildWebpackBrowser } from '../../index';
+import { OutputHashing } from '../../schema';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "outputHashing"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for asset tests
+      await harness.writeFile('src/main.ts', '');
+    });
+
+    it('hashes all filenames when set to "all"', async () => {
+      await harness.writeFile(
+        'src/styles.css',
+        `h1 { background: url('./spectrum.png')}`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        outputHashing: OutputHashing.All,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /runtime\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /main\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /polyfills\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.css$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /spectrum\.[0-9a-f]{20}\.png$/)).toBeTrue();
+    });
+
+    it(`doesn't hash any filenames when not set`, async () => {
+      await harness.writeFile(
+        'src/styles.css',
+        `h1 { background: url('./spectrum.png')}`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /runtime\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /main\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /polyfills\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.css$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /spectrum\.[0-9a-f]{20}\.png$/)).toBeFalse();
+    });
+
+    it(`doesn't hash any filenames when set to "none"`, async () => {
+      await harness.writeFile(
+        'src/styles.css',
+        `h1 { background: url('./spectrum.png')}`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        outputHashing: OutputHashing.None,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /runtime\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /main\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /polyfills\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.css$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /spectrum\.[0-9a-f]{20}\.png$/)).toBeFalse();
+    });
+
+    it(`hashes CSS resources filenames only when set to "media"`, async () => {
+      await harness.writeFile(
+        'src/styles.css',
+        `h1 { background: url('./spectrum.png')}`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        outputHashing: OutputHashing.Media,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /runtime\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /main\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /polyfills\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.css$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /spectrum\.[0-9a-f]{20}\.png$/)).toBeTrue();
+    });
+
+    it(`hashes bundles filenames only when set to "bundles"`, async () => {
+      await harness.writeFile(
+        'src/styles.css',
+        `h1 { background: url('./spectrum.png')}`,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        outputHashing: OutputHashing.Bundles,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /runtime\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /main\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /polyfills\.[0-9a-f]{20}\.js$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.css$/)).toBeTrue();
+      expect(harness.hasFileMatch('dist', /spectrum\.[0-9a-f]{20}\.png$/)).toBeFalse();
+    });
+
+    it('does not hash non injected styles', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        outputHashing: OutputHashing.All,
+        styles: [{
+          input: 'src/styles.css',
+          inject: false,
+        }],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.js$/)).toBeFalse();
+      expect(harness.hasFileMatch('dist', /styles\.[0-9a-f]{20}\.js.map$/)).toBeFalse();
+      harness.expectFile('dist/styles.css').toExist();
+      harness.expectFile('dist/styles.css.map').toExist();
+    });
+
+    it('does not override different files which has the same filenames when hashing is "none"', async () => {
+      await harness.writeFiles({
+        'src/styles.css': `
+        h1 { background: url('./test.svg')}
+        h2 { background: url('./small/test.svg')}
+      `,
+        './src/test.svg': `<svg xmlns="http://www.w3.org/2000/svg">
+        <text x="20" y="20" font-size="20" fill="red">Hello World</text>
+      </svg>`,
+        './src/small/test.svg': `<svg xmlns="http://www.w3.org/2000/svg">
+        <text x="10" y="10" font-size="10" fill="red">Hello World</text>
+      </svg>`,
+      });
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        outputHashing: OutputHashing.None,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/test.svg').toExist();
+      harness.expectFile('dist/small-test.svg').toExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/polyfills_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/polyfills_spec.ts
new file mode 100644
index 000000000000..587fe85be84c
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/polyfills_spec.ts
@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "polyfills"', () => {
+    it('uses a provided TypeScript file', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        polyfills: 'src/polyfills.ts',
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/polyfills.js').toExist();
+    });
+
+    it('uses a provided JavaScript file', async () => {
+      await harness.writeFile('src/polyfills.js', `console.log('main');`);
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        polyfills: 'src/polyfills.js',
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/polyfills.js').content.toContain(`console.log('main')`);
+    });
+
+    it('fails and shows an error when file does not exist', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        polyfills: 'src/missing.ts',
+      });
+
+      const { result, logs } = await harness.executeOnce({ outputLogsOnFailure: false });
+
+      expect(result?.success).toBe(false);
+      expect(logs).toContain(
+        jasmine.objectContaining({ message: jasmine.stringMatching('Module not found:') }),
+      );
+
+      harness.expectFile('dist/polyfills.js').toNotExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/scripts_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/scripts_spec.ts
new file mode 100644
index 000000000000..abe0b4cc1b47
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/scripts_spec.ts
@@ -0,0 +1,416 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "scripts"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for scripts tests
+      await harness.writeFile('src/main.ts', '');
+    });
+
+    it('supports an empty array value', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        scripts: [],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+    });
+
+    describe('shorthand syntax', () => {
+      it('processes a single script into a single output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: ['src/test-script-a.js'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('processes multiple scripts into a single output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+        await harness.writeFile('src/test-script-b.js', 'console.log("b");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: ['src/test-script-a.js', 'src/test-script-b.js'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("b")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('preserves order of multiple scripts in single output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+        await harness.writeFile('src/test-script-b.js', 'console.log("b");');
+        await harness.writeFile('src/test-script-c.js', 'console.log("c");');
+        await harness.writeFile('src/test-script-d.js', 'console.log("d");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [
+            'src/test-script-c.js',
+            'src/test-script-d.js',
+            'src/test-script-b.js',
+            'src/test-script-a.js',
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/scripts.js')
+          .content.toMatch(
+            /console\.log\("c"\)[;\s]+console\.log\("d"\)[;\s]+console\.log\("b"\)[;\s]+console\.log\("a"\)/,
+          );
+      });
+
+      it('throws an exception if script does not exist', async () => {
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: ['src/test-script-a.js'],
+        });
+
+        const { result, error } = await harness.executeOnce({ outputLogsOnException: false });
+
+        expect(result).toBeUndefined();
+        expect(error).toEqual(
+          jasmine.objectContaining({
+            message: jasmine.stringMatching(`Script file src/test-script-a.js does not exist.`),
+          }),
+        );
+
+        harness.expectFile('dist/scripts.js').toNotExist();
+      });
+
+      it('shows the output script as a chunk entry in the logging output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: ['src/test-script-a.js'],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/scripts\.js.+\d+ bytes/) }),
+        );
+      });
+    });
+
+    describe('longhand syntax', () => {
+      it('processes a single script into a single output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('processes a single script into a single output named with bundleName', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', bundleName: 'extra' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="extra.js" defer></script>');
+      });
+
+      it('uses default bundleName when bundleName is empty string', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', bundleName: '' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('processes multiple scripts with no bundleName into a single output', async () => {
+        await harness.writeFiles({
+          'src/test-script-a.js': 'console.log("a");',
+          'src/test-script-b.js': 'console.log("b");',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js' }, { input: 'src/test-script-b.js' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("b")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('processes multiple scripts with same bundleName into a single output', async () => {
+        await harness.writeFiles({
+          'src/test-script-a.js': 'console.log("a");',
+          'src/test-script-b.js': 'console.log("b");',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [
+            { input: 'src/test-script-a.js', bundleName: 'extra' },
+            { input: 'src/test-script-b.js', bundleName: 'extra' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.js').content.toContain('console.log("a")');
+        harness.expectFile('dist/extra.js').content.toContain('console.log("b")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="extra.js" defer></script>');
+      });
+
+      it('processes multiple scripts with different bundleNames into separate outputs', async () => {
+        await harness.writeFiles({
+          'src/test-script-a.js': 'console.log("a");',
+          'src/test-script-b.js': 'console.log("b");',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [
+            { input: 'src/test-script-a.js', bundleName: 'extra' },
+            { input: 'src/test-script-b.js', bundleName: 'other' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.js').content.toContain('console.log("a")');
+        harness.expectFile('dist/other.js').content.toContain('console.log("b")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="extra.js" defer></script>');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="other.js" defer></script>');
+      });
+
+      it('preserves order of multiple scripts in single output', async () => {
+        await harness.writeFiles({
+          'src/test-script-a.js': 'console.log("a");',
+          'src/test-script-b.js': 'console.log("b");',
+          'src/test-script-c.js': 'console.log("c");',
+          'src/test-script-d.js': 'console.log("d");',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [
+            { input: 'src/test-script-c.js' },
+            { input: 'src/test-script-d.js' },
+            { input: 'src/test-script-b.js' },
+            { input: 'src/test-script-a.js' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/scripts.js')
+          .content.toMatch(
+            /console\.log\("c"\)[;\s]+console\.log\("d"\)[;\s]+console\.log\("b"\)[;\s]+console\.log\("a"\)/,
+          );
+      });
+
+      it('preserves order of multiple scripts with different bundleNames', async () => {
+        await harness.writeFiles({
+          'src/test-script-a.js': 'console.log("a");',
+          'src/test-script-b.js': 'console.log("b");',
+          'src/test-script-c.js': 'console.log("c");',
+          'src/test-script-d.js': 'console.log("d");',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [
+            { input: 'src/test-script-c.js', bundleName: 'other' },
+            { input: 'src/test-script-d.js', bundleName: 'extra' },
+            { input: 'src/test-script-b.js', bundleName: 'extra' },
+            { input: 'src/test-script-a.js', bundleName: 'other' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/other.js')
+          .content.toMatch(/console\.log\("c"\)[;\s]+console\.log\("a"\)/);
+        harness
+          .expectFile('dist/extra.js')
+          .content.toMatch(/console\.log\("d"\)[;\s]+console\.log\("b"\)/);
+        harness
+          .expectFile('dist/index.html')
+          .content.toMatch(
+            /<script src="other.js" defer><\/script>\s*<script src="extra.js" defer><\/script>/,
+          );
+      });
+
+      it('adds script element to index when inject is true', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', inject: true }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/scripts.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<script src="scripts.js" defer></script>');
+      });
+
+      it('does not add script element to index when inject is false', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', inject: false }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        // `inject: false` causes the bundleName to be the input file name
+        harness.expectFile('dist/test-script-a.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.not.toContain('<script src="test-script-a.js" defer></script>');
+      });
+
+      it('does not add script element to index with bundleName when inject is false', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', bundleName: 'extra', inject: false }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.js').content.toContain('console.log("a")');
+        harness
+          .expectFile('dist/index.html')
+          .content.not.toContain('<script src="extra.js" defer></script>');
+      });
+
+      it('shows the output script as a chunk entry in the logging output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js' }],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/scripts\.js.+\d+ bytes/) }),
+        );
+      });
+
+      it('shows the output script as a chunk entry with bundleName in the logging output', async () => {
+        await harness.writeFile('src/test-script-a.js', 'console.log("a");');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          scripts: [{ input: 'src/test-script-a.js', bundleName: 'extra' }],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/extra\.js.+\d+ bytes/) }),
+        );
+      });
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/stats-json_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/stats-json_spec.ts
new file mode 100644
index 000000000000..177799a51171
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/stats-json_spec.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "statsJson"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for stat JSON tests
+      await harness.writeFile('src/main.ts', '');
+    });
+
+    it('generates a Webpack Stats file in output when true', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        statsJson: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      if (harness.expectFile('dist/stats.json').toExist()) {
+        const content = harness.readFile('dist/stats.json');
+        expect(() => JSON.parse(content))
+          .withContext('Expected Webpack Stats file to be valid JSON.')
+          .not.toThrow();
+      }
+    });
+
+    it('includes Webpack profiling information', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        statsJson: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      if (harness.expectFile('dist/stats.json').toExist()) {
+        const stats = JSON.parse(harness.readFile('dist/stats.json'));
+        expect(stats?.chunks?.[0]?.modules?.[0]?.profile?.building).toBeDefined();
+      }
+    });
+
+    it('does not generate a Webpack Stats file in output when false', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        statsJson: false,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/stats.json').toNotExist();
+    });
+
+    it('does not generate a Webpack Stats file in output when not present', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/stats.json').toNotExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/styles_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/styles_spec.ts
new file mode 100644
index 000000000000..e726fbaf565a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/styles_spec.ts
@@ -0,0 +1,432 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "styles"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for styles tests
+      await harness.writeFile('src/main.ts', '');
+    });
+
+    it('supports an empty array value', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: [],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/styles.css').toNotExist();
+    });
+
+    it('does not create an output styles file when option is not present', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/styles.css').toNotExist();
+    });
+
+    describe('shorthand syntax', () => {
+      it('processes a single style into a single output', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: ['src/test-style-a.css'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('processes multiple styles into a single output', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: ['src/test-style-a.css', 'src/test-style-b.css'],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness.expectFile('dist/styles.css').content.toContain('.test-b {color: green}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('preserves order of multiple styles in single output', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+          'src/test-style-c.css': '.test-c {color: blue}',
+          'src/test-style-d.css': '.test-d {color: yellow}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [
+            'src/test-style-c.css',
+            'src/test-style-d.css',
+            'src/test-style-b.css',
+            'src/test-style-a.css',
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/styles.css')
+          .content.toMatch(
+            /\.test-c {color: blue}\s+\.test-d {color: yellow}\s+\.test-b {color: green}\s+\.test-a {color: red}/,
+          );
+      });
+
+      it('fails and shows an error if style does not exist', async () => {
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: ['src/test-style-a.css'],
+        });
+
+        const { result, logs } = await harness.executeOnce({ outputLogsOnFailure: false });
+
+        expect(result?.success).toBeFalse();
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching('Module not found:') }),
+        );
+
+        harness.expectFile('dist/styles.css').toNotExist();
+      });
+
+      it('shows the output style as a chunk entry in the logging output', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: ['src/test-style-a.css'],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/styles\.css.+\d+ bytes/) }),
+        );
+      });
+    });
+
+    describe('longhand syntax', () => {
+      it('processes a single style into a single output', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('processes a single style into a single output named with bundleName', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', bundleName: 'extra' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="extra.css">');
+      });
+
+      it('uses default bundleName when bundleName is empty string', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', bundleName: '' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('processes multiple styles with no bundleName into a single output', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css' }, { input: 'src/test-style-b.css' }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness.expectFile('dist/styles.css').content.toContain('.test-b {color: green}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('processes multiple styles with same bundleName into a single output', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [
+            { input: 'src/test-style-a.css', bundleName: 'extra' },
+            { input: 'src/test-style-b.css', bundleName: 'extra' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.css').content.toContain('.test-a {color: red}');
+        harness.expectFile('dist/extra.css').content.toContain('.test-b {color: green}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="extra.css">');
+      });
+
+      it('processes multiple styles with different bundleNames into separate outputs', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [
+            { input: 'src/test-style-a.css', bundleName: 'extra' },
+            { input: 'src/test-style-b.css', bundleName: 'other' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.css').content.toContain('.test-a {color: red}');
+        harness.expectFile('dist/other.css').content.toContain('.test-b {color: green}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="extra.css">');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="other.css">');
+      });
+
+      it('preserves order of multiple styles in single output', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+          'src/test-style-c.css': '.test-c {color: blue}',
+          'src/test-style-d.css': '.test-d {color: yellow}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [
+            { input: 'src/test-style-c.css' },
+            { input: 'src/test-style-d.css' },
+            { input: 'src/test-style-b.css' },
+            { input: 'src/test-style-a.css' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/styles.css')
+          .content.toMatch(
+            /\.test-c {color: blue}\s+\.test-d {color: yellow}\s+\.test-b {color: green}\s+\.test-a {color: red}/,
+          );
+      });
+
+      it('preserves order of multiple styles with different bundleNames', async () => {
+        await harness.writeFiles({
+          'src/test-style-a.css': '.test-a {color: red}',
+          'src/test-style-b.css': '.test-b {color: green}',
+          'src/test-style-c.css': '.test-c {color: blue}',
+          'src/test-style-d.css': '.test-d {color: yellow}',
+        });
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [
+            { input: 'src/test-style-c.css', bundleName: 'other' },
+            { input: 'src/test-style-d.css', bundleName: 'extra' },
+            { input: 'src/test-style-b.css', bundleName: 'extra' },
+            { input: 'src/test-style-a.css', bundleName: 'other' },
+          ],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness
+          .expectFile('dist/other.css')
+          .content.toMatch(/\.test-c {color: blue}\s+\.test-a {color: red}/);
+        harness
+          .expectFile('dist/extra.css')
+          .content.toMatch(/\.test-d {color: yellow}\s+\.test-b {color: green}/);
+        harness
+          .expectFile('dist/index.html')
+          .content.toMatch(
+            /<link rel="stylesheet" href="other.css">\s*<link rel="stylesheet" href="extra.css">/,
+          );
+      });
+
+      it('adds link element to index when inject is true', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', inject: true }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/styles.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.toContain('<link rel="stylesheet" href="styles.css">');
+      });
+
+      it('does not add link element to index when inject is false', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', inject: false }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        // `inject: false` causes the bundleName to be the input file name
+        harness.expectFile('dist/test-style-a.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.not.toContain('<link rel="stylesheet" href="test-style-a.css">');
+      });
+
+      it('does not add link element to index with bundleName when inject is false', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', bundleName: 'extra', inject: false }],
+        });
+
+        const { result } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        harness.expectFile('dist/extra.css').content.toContain('.test-a {color: red}');
+        harness
+          .expectFile('dist/index.html')
+          .content.not.toContain('<link rel="stylesheet" href="extra.css">');
+      });
+
+      it('shows the output style as a chunk entry in the logging output', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css' }],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/styles\.css.+\d+ bytes/) }),
+        );
+      });
+
+      it('shows the output style as a chunk entry with bundleName in the logging output', async () => {
+        await harness.writeFile('src/test-style-a.css', '.test-a {color: red}');
+
+        harness.useTarget('build', {
+          ...BASE_OPTIONS,
+          styles: [{ input: 'src/test-style-a.css', bundleName: 'extra' }],
+        });
+
+        const { result, logs } = await harness.executeOnce();
+
+        expect(result?.success).toBe(true);
+
+        expect(logs).toContain(
+          jasmine.objectContaining({ message: jasmine.stringMatching(/extra\.css.+\d+ bytes/) }),
+        );
+      });
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/subresource-integrity_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/subresource-integrity_spec.ts
new file mode 100644
index 000000000000..3561aa2c332a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/subresource-integrity_spec.ts
@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { logging } from '@angular-devkit/core';
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "subresourceIntegrity"', () => {
+    it(`does not add integrity attribute when not present`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.not.toContain('integrity=');
+    });
+
+    it(`does not add integrity attribute when 'false'`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        subresourceIntegrity: false,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.not.toContain('integrity=');
+    });
+
+    it(`does add integrity attribute when 'true'`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        subresourceIntegrity: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
+    });
+
+    it(`does not issue a warning when 'true' and 'scripts' is set.`, async () => {
+      await harness.writeFile('src/script.js', '');
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        subresourceIntegrity: true,
+        scripts: ['src/script.js'],
+      });
+
+      const { result, logs } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
+      expect(logs).not.toContain(
+        jasmine.objectContaining<logging.LogEntry>({
+          message: jasmine.stringMatching(/subresource-integrity/),
+        }),
+      );
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/tsconfig_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/tsconfig_spec.ts
new file mode 100644
index 000000000000..289c5f780a01
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/tsconfig_spec.ts
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "tsConfig"', () => {
+    it('uses a provided TypeScript configuration file', async () => {
+      // Setup a TS file that uses ES2015+ const and then target ES5.
+      // The const usage should be downleveled in the output if the TS config is used.
+      await harness.writeFile('src/main.ts', 'const a = 5; console.log(a);');
+      await harness.writeFile(
+        'src/tsconfig.option.json',
+        JSON.stringify({
+          compilerOptions: {
+            target: 'es5',
+            types: [],
+          },
+          files: ['main.ts'],
+        }),
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        tsConfig: 'src/tsconfig.option.json',
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/main.js').content.not.toContain('const');
+    });
+
+    it('throws an exception when TypeScript Configuration file does not exist', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        tsConfig: 'src/missing.json',
+      });
+
+      const { result, error } = await harness.executeOnce({ outputLogsOnException: false });
+
+      expect(result).toBeUndefined();
+      expect(error).toEqual(
+        jasmine.objectContaining({
+          message: jasmine.stringMatching('no such file or directory'),
+        }),
+      );
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/watch_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/watch_spec.ts
new file mode 100644
index 000000000000..6b4bc73fb92d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/watch_spec.ts
@@ -0,0 +1,103 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { concatMap, count, take, timeout } from 'rxjs/operators';
+import { buildWebpackBrowser } from '../../index';
+import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
+  describe('Option: "watch"', () => {
+    it('does not wait for file changes when false', (done) => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        watch: false,
+      });
+
+      // If the build waits then it will timeout with the custom timeout.
+      // A single build should not take more than 15 seconds.
+      let count = 0;
+      harness
+        .execute()
+        .pipe(timeout(15000))
+        .subscribe({
+          complete() {
+            expect(count).toBe(1);
+            done();
+          },
+          next({ result }) {
+            count++;
+            expect(result?.success).toBe(true);
+          },
+          error(error) {
+            done.fail(error);
+          },
+        });
+    });
+
+    it('does not wait for file changes when not present', (done) => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      // If the build waits then it will timeout with the custom timeout.
+      // A single build should not take more than 15 seconds.
+      let count = 0;
+      harness
+        .execute()
+        .pipe(timeout(15000))
+        .subscribe({
+          complete() {
+            expect(count).toBe(1);
+            done();
+          },
+          next({ result }) {
+            count++;
+            expect(result?.success).toBe(true);
+          },
+          error(error) {
+            done.fail(error);
+          },
+        });
+    });
+
+    it('watches for file changes when true', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        main: 'src/main.ts',
+        watch: true,
+      });
+
+      const buildCount = await harness
+        .execute()
+        .pipe(
+          timeout(30000),
+          concatMap(async ({ result }, index) => {
+            expect(result?.success).toBe(true);
+
+            switch (index) {
+              case 0:
+                harness.expectFile('dist/main.js').content.not.toContain('abcd1234');
+
+                await harness.modifyFile(
+                  'src/main.ts',
+                  (content) => content + 'console.log("abcd1234");',
+                );
+                break;
+              case 1:
+                harness.expectFile('dist/main.js').content.toContain('abcd1234');
+                break;
+            }
+          }),
+          take(2),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(2);
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/setup.ts b/packages/angular_devkit/build_angular/src/browser/tests/setup.ts
new file mode 100644
index 000000000000..d511bd2ac8ad
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/setup.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 '../schema';
+
+export { describeBuilder } from '../../testing';
+
+export const BROWSER_BUILDER_INFO = Object.freeze({
+  name: '@angular-devkit/build-angular:browser',
+  schemaPath: __dirname + '/../schema.json',
+});
+
+/**
+ * Contains all required browser builder fields.
+ * Also disables progress reporting to minimize logging output.
+ */
+export const BASE_OPTIONS = Object.freeze<Schema>({
+  index: 'src/index.html',
+  main: 'src/main.ts',
+  outputPath: 'dist',
+  tsConfig: 'src/tsconfig.app.json',
+  progress: false,
+});
diff --git a/packages/angular_devkit/build_angular/src/dev-server/allowed-hosts_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/allowed-hosts_spec.ts
index c36d18182906..27b659128094 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/allowed-hosts_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/allowed-hosts_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/budgets_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/budgets_spec.ts
index 735db97a68d6..f40df3e3ab26 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/budgets_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/budgets_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/common-js-warning_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/common-js-warning_spec.ts
new file mode 100644
index 000000000000..56cf7e7d8471
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/dev-server/common-js-warning_spec.ts
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 } from '../test-utils';
+
+describe('Dev Server Builder commonjs warning', () => {
+  const targetSpec = { project: 'app', target: 'serve' };
+
+  let architect: Architect;
+  let logger: logging.Logger;
+  let logs: string[];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+
+    // Create logger
+    logger = new logging.Logger('');
+    logs = [];
+    logger.subscribe(e => logs.push(e.message));
+  });
+
+  afterEach(async () => host.restore().toPromise());
+
+  it('should not show warning when using HMR', async () => {
+    const run = await architect.scheduleTarget(targetSpec, { hmr: true }, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('Warning');
+    await run.stop();
+  });
+
+  it('should not show warning when using live-reload', async () => {
+    const run = await architect.scheduleTarget(targetSpec, { liveReload: true}, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('Warning');
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/dev-server/deploy-url_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/deploy-url_spec.ts
index 125b8cd05ae3..757d0ed1527a 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/deploy-url_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/deploy-url_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts
index a4215a6b180c..a617ccd5a45b 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts
@@ -1,15 +1,15 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
 // tslint:disable: no-implicit-dependencies
-import puppeteer from 'puppeteer/lib/cjs/puppeteer';
 import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser';
 import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
+import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
 // tslint:enable: no-implicit-dependencies
 import { debounceTime, switchMap, take } from 'rxjs/operators';
 import { createArchitect, host } from '../test-utils';
@@ -56,8 +56,8 @@ describe('Dev Server Builder HMR', () => {
       'src/app/app.component.html': `
         <p>{{title}}</p>
 
-        <input type="text">
-
+        <input class="visible" type="text">
+        <input type="hidden">
         <select>
           <option>one</option>
           <option>two</option>
@@ -165,7 +165,7 @@ describe('Dev Server Builder HMR', () => {
               await page.goto(url);
               expect(logs).toContain('[HMR] Waiting for update signal from WDS...');
               await page.evaluate(() => {
-                document.querySelector('input').value = 'input value';
+                document.querySelector('input.visible').value = 'input value';
                 document.querySelector('select').value = 'two';
               });
 
@@ -177,7 +177,7 @@ describe('Dev Server Builder HMR', () => {
               expect(logs).toContain('[NG HMR] Restoring input/textarea values.');
               expect(logs).toContain('[NG HMR] Restoring selected options.');
 
-              const inputValue = await page.evaluate(() => document.querySelector('input').value);
+              const inputValue = await page.evaluate(() => document.querySelector('input.visible').value);
               expect(inputValue).toBe('input value');
 
               const selectValue = await page.evaluate(() => document.querySelector('select').value);
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 1c13473af3d6..04ca568f61aa 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -12,31 +12,36 @@ import {
   WebpackLoggingCallback,
   runWebpackDevServer,
 } from '@angular-devkit/build-webpack';
-import { json, logging, tags } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { existsSync, readFileSync } from 'fs';
+import { json, tags } from '@angular-devkit/core';
 import * as path from 'path';
 import { Observable, from } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { concatMap, 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';
-import { buildBrowserWebpackConfigFromContext } from '../browser';
-import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import * as webpackDevServer from 'webpack-dev-server';
+import { getAnalyticsConfig, getCompilerConfig } from '../browser';
+import { OutputHashing, Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, normalizeOptimization } from '../utils';
 import { findCachePath } from '../utils/cache-path';
 import { checkPort } from '../utils/check-port';
+import { colors } from '../utils/color';
 import { I18nOptions } from '../utils/i18n-options';
-import { getHtmlTransforms } from '../utils/index-file/transforms';
-import { IndexHtmlTransform } from '../utils/index-file/write-index-html';
+import { IndexHtmlTransform } from '../utils/index-file/index-html-generator';
 import { generateEntryPoints } from '../utils/package-chunk-sort';
-import { createI18nPlugins } from '../utils/process-bundle';
 import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
-import { getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
+import { generateI18nBrowserWebpackConfigFromContext, getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
 import { addError, addWarning } from '../utils/webpack-diagnostics';
+import {
+  getBrowserConfig,
+  getCommonConfig,
+  getDevServerConfig,
+  getStatsConfig,
+  getStylesConfig,
+  getWorkerConfig,
+} from '../webpack/configs';
 import { IndexHtmlWebpackPlugin } from '../webpack/plugins/index-html-webpack-plugin';
 import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Schema } from './schema';
@@ -79,22 +84,20 @@ export function serveWebpackBrowser(
   } = {},
 ): Observable<DevServerBuilderOutput> {
   // Check Angular version.
-  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
+  const { logger, workspaceRoot } = context;
+  assertCompatibleAngularVersion(workspaceRoot, logger);
 
   const browserTarget = targetFromTargetString(options.browserTarget);
-  const root = context.workspaceRoot;
-  let first = true;
-  const host = new NodeJsSyncHost();
 
   async function setup(): Promise<{
     browserOptions: json.JsonObject & BrowserBuilderSchema;
     webpackConfig: webpack.Configuration;
-    webpackDevServerConfig: WebpackDevServer.Configuration;
     projectRoot: string;
     locale: string | undefined;
   }> {
     // Get the browser configuration from the target name.
-    const rawBrowserOptions = await context.getTargetOptions(browserTarget);
+    const rawBrowserOptions = (await context.getTargetOptions(browserTarget)) as json.JsonObject & BrowserBuilderSchema;
+    options.port = await checkPort(options.port ?? 4200, options.host || 'localhost');
 
     // Override options we need to override, if defined.
     const overrides = (Object.keys(options) as (keyof DevServerBuilderOptions)[])
@@ -107,41 +110,141 @@ export function serveWebpackBrowser(
         {},
       );
 
+    // Get dev-server only options.
+    type DevServerOptions = Partial<Omit<Schema,
+      'watch' | 'optimization' | 'aot' | 'sourceMap' | 'vendorChunk' | 'commonChunk' | 'baseHref' | 'progress' | 'poll' | 'verbose' | 'deployUrl'>>;
+    const devServerOptions: DevServerOptions = (Object.keys(options) as (keyof Schema)[])
+      .filter(key => !devServerBuildOverriddenKeys.includes(key) && key !== 'browserTarget')
+      .reduce<DevServerOptions>(
+        (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;
 
+    if (rawBrowserOptions.outputHashing && rawBrowserOptions.outputHashing !== OutputHashing.None) {
+      // Disable output hashing for dev build as this can cause memory leaks
+      // See: https://github.com/webpack/webpack-dev-server/issues/377#issuecomment-241258405
+      overrides.outputHashing = OutputHashing.None;
+      logger.warn(`Warning: 'outputHashing' option is disabled when using the dev-server.`);
+    }
+
     const browserName = await context.getBuilderNameForTarget(browserTarget);
-    const browserOptions = await context.validateOptions<json.JsonObject & BrowserBuilderSchema>(
+    const browserOptions = await context.validateOptions(
       { ...rawBrowserOptions, ...overrides },
       browserName,
-    );
+    ) as json.JsonObject & BrowserBuilderSchema;
 
-    const { config, projectRoot, i18n } = await buildBrowserWebpackConfigFromContext(
+    const { config, projectRoot, i18n } = await generateI18nBrowserWebpackConfigFromContext(
       browserOptions,
       context,
-      host,
-      { hmr: options.hmr },
+      wco => [
+        getDevServerConfig(wco),
+        getCommonConfig(wco),
+        getBrowserConfig(wco),
+        getStylesConfig(wco),
+        getStatsConfig(wco),
+        getAnalyticsConfig(wco, context),
+        getCompilerConfig(wco),
+        browserOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
+      ],
+      devServerOptions,
     );
-    let webpackConfig = config;
 
-    const tsConfig = readTsconfig(browserOptions.tsConfig, context.workspaceRoot);
-    if (i18n.shouldInline && tsConfig.options.enableIvy !== false) {
-      if (i18n.inlineLocales.size > 1) {
-        throw new Error(
-          'The development server only supports localizing a single locale per build',
-        );
+    if (!config.devServer) {
+      throw new Error(
+        'Webpack Dev Server configuration was not set.',
+      );
+    }
+
+    if (options.liveReload && !options.hmr) {
+      // This is needed because we cannot use the inline option directly in the config
+      // because of the SuppressExtractedTextChunksWebpackPlugin
+      // Consider not using SuppressExtractedTextChunksWebpackPlugin when liveReload is enable.
+      webpackDevServer.addDevServerEntrypoints(config, {
+        ...config.devServer,
+        inline: true,
+      });
+
+      // Remove live-reload code from all entrypoints but not main.
+      // Otherwise this will break SuppressExtractedTextChunksWebpackPlugin because
+      // 'addDevServerEntrypoints' adds addional entry-points to all entries.
+      if (config.entry && typeof config.entry === 'object' && !Array.isArray(config.entry) && config.entry.main) {
+        for (const [key, value] of Object.entries(config.entry)) {
+          if (key === 'main' || typeof value === 'string') {
+            continue;
+          }
+
+          const webpackClientScriptIndex = value.findIndex(x => x.includes('webpack-dev-server/client/index.js'));
+          if (webpackClientScriptIndex >= 0) {
+            // Remove the webpack-dev-server/client script from array.
+            value.splice(webpackClientScriptIndex, 1);
+          }
+        }
       }
+    }
 
-      await setupLocalize(i18n, browserOptions, webpackConfig);
+    if (options.hmr) {
+      logger.warn(tags.stripIndents`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.
+      See https://webpack.js.org/guides/hot-module-replacement for information on working with HMR for Webpack.`);
     }
 
-    options.port = await checkPort(options.port ?? 4200, options.host || 'localhost');
-    const webpackDevServerConfig = (webpackConfig.devServer = buildServerConfig(
-      root,
-      options,
-      browserOptions,
-      context.logger,
-    ));
+    if (
+      options.host
+      && !/^127\.\d+\.\d+\.\d+/g.test(options.host)
+      && options.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 (options.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.
+      `);
+    }
+
+    let locale: string | undefined;
+    if (browserOptions.i18nLocale) {
+      // Deprecated VE option
+      locale = browserOptions.i18nLocale;
+    } else if (i18n.shouldInline) {
+      // Dev-server only supports one locale
+      locale = [...i18n.inlineLocales][0];
+    } else if (i18n.hasDefinedSourceLocale) {
+      // use source locale if not localizing
+      locale = i18n.sourceLocale;
+    }
+
+    let webpackConfig = config;
+
+    // If a locale is defined, setup localization
+    if (locale) {
+      // Only supported with Ivy
+      const tsConfig = readTsconfig(browserOptions.tsConfig, workspaceRoot);
+      if (tsConfig.options.enableIvy !== false) {
+        if (i18n.inlineLocales.size > 1) {
+          throw new Error(
+            'The development server only supports localizing a single locale per build.',
+          );
+        }
+
+        await setupLocalize(locale, i18n, browserOptions, webpackConfig);
+      }
+    }
 
     if (transforms.webpackConfiguration) {
       webpackConfig = await transforms.webpackConfiguration(webpackConfig);
@@ -150,53 +253,18 @@ export function serveWebpackBrowser(
     return {
       browserOptions,
       webpackConfig,
-      webpackDevServerConfig,
       projectRoot,
-      locale:
-        browserOptions.i18nLocale || (i18n.shouldInline ? [...i18n.inlineLocales][0] : undefined),
+      locale,
     };
   }
 
   return from(setup()).pipe(
-    switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, projectRoot, locale }) => {
-      // Resolve public host and client address.
-      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}`;
-        }
-        clientAddress = url.parse(publicHost);
-        options.publicHost = clientAddress.host;
-      }
-
-      // Add live reload config.
-      if (options.liveReload) {
-        _addLiveReload(root, options, browserOptions, webpackConfig, clientAddress, context.logger);
-      } else if (options.hmr) {
-        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.push({
-          // tslint:disable-next-line:no-any
-          apply: (compiler: any) => {
-            compiler.hooks.afterEnvironment.tap('angular-cli', () => {
-              compiler.watchFileSystem = { watch: () => {} };
-            });
-          },
-        });
-      }
-
+    switchMap(({ browserOptions, webpackConfig, projectRoot, locale }) => {
       const normalizedOptimization = normalizeOptimization(browserOptions.optimization);
 
       if (browserOptions.index) {
         const { scripts = [], styles = [], baseHref, tsConfig } = browserOptions;
-        const { options: compilerOptions } = readTsconfig(tsConfig, context.workspaceRoot);
+        const { options: compilerOptions } = readTsconfig(tsConfig, workspaceRoot);
         const target = compilerOptions.target || ts.ScriptTarget.ES5;
         const buildBrowserFeatures = new BuildBrowserFeatures(projectRoot);
 
@@ -205,29 +273,28 @@ export function serveWebpackBrowser(
           ? generateEntryPoints({ scripts: [], styles })
           : [];
 
+        webpackConfig.plugins = [...(webpackConfig.plugins || [])];
         webpackConfig.plugins.push(
           new IndexHtmlWebpackPlugin({
-            input: path.resolve(root, getIndexInputFile(browserOptions)),
-            output: getIndexOutputFile(browserOptions),
+            indexPath: path.resolve(workspaceRoot, getIndexInputFile(browserOptions.index)),
+            outputPath: getIndexOutputFile(browserOptions.index),
             baseHref,
-            moduleEntrypoints,
             entrypoints,
+            moduleEntrypoints,
+            noModuleEntrypoints: ['polyfills-es5'],
             deployUrl: browserOptions.deployUrl,
             sri: browserOptions.subresourceIntegrity,
-            noModuleEntrypoints: ['polyfills-es5'],
-            postTransforms: getHtmlTransforms(
-              normalizedOptimization,
-              buildBrowserFeatures,
-              transforms.indexHtml,
-            ),
+            postTransform: transforms.indexHtml,
+            optimization: normalizedOptimization,
+            WOFFSupportNeeded: !buildBrowserFeatures.isFeatureSupported('woff2'),
             crossOrigin: browserOptions.crossOrigin,
             lang: locale,
           }),
         );
       }
 
-      if (normalizedOptimization.scripts || normalizedOptimization.styles) {
-        context.logger.error(tags.stripIndents`
+      if (normalizedOptimization.scripts || normalizedOptimization.styles.minify) {
+        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.
@@ -241,37 +308,36 @@ export function serveWebpackBrowser(
         webpackConfig,
         context,
         {
-          logging: transforms.logging || createWebpackLoggingCallback(!!options.verbose, context.logger),
+          logging: transforms.logging || createWebpackLoggingCallback(!!options.verbose, logger),
           webpackFactory: require('webpack') as typeof webpack,
-          webpackDevServerFactory: require('webpack-dev-server') as typeof WebpackDevServer,
+          webpackDevServerFactory: require('webpack-dev-server') as typeof webpackDevServer,
         },
       ).pipe(
-        map(buildEvent => {
+        concatMap(async (buildEvent, index) => {
           // 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,
+            pathname: webpackConfig.devServer?.publicPath,
             port: buildEvent.port,
           });
 
-          if (first) {
-            first = false;
-            context.logger.info(tags.oneLine`
+          if (index === 0) {
+            logger.info('\n' + tags.oneLine`
               **
               Angular Live Development Server is listening on ${options.host}:${buildEvent.port},
               open your browser on ${serverAddress}
               **
-            `);
+            ` + '\n');
 
             if (options.open) {
-              const open = require('open');
-              open(serverAddress);
+              const open = await import('open');
+              await open(serverAddress);
             }
           }
 
           if (buildEvent.success) {
-            context.logger.info(': Compiled successfully.');
+            logger.info(`\n${colors.greenBright(colors.symbols.check)} Compiled successfully.`);
           }
 
           return { ...buildEvent, baseUrl: serverAddress } as DevServerBuilderOutput;
@@ -282,17 +348,12 @@ export function serveWebpackBrowser(
 }
 
 async function setupLocalize(
+  locale: string,
   i18n: I18nOptions,
   browserOptions: BrowserBuilderSchema,
   webpackConfig: webpack.Configuration,
 ) {
-  const locale = [...i18n.inlineLocales][0];
   const localeDescription = i18n.locales[locale];
-  const { plugins, diagnostics } = await createI18nPlugins(
-    locale,
-    localeDescription?.translation,
-    browserOptions.i18nMissingTranslation || 'ignore',
-  );
 
   // Modify main entrypoint to include locale data
   if (
@@ -308,24 +369,33 @@ async function setupLocalize(
     }
   }
 
+  let missingTranslationBehavior = browserOptions.i18nMissingTranslation || 'ignore';
+  let translation = localeDescription?.translation || {};
+
+  if (locale === i18n.sourceLocale) {
+    missingTranslationBehavior = 'ignore';
+    translation = {};
+  }
+
+  const i18nLoaderOptions = {
+    locale,
+    missingTranslationBehavior,
+    translation: i18n.shouldInline ? translation : undefined,
+  };
+
   const i18nRule: webpack.RuleSetRule = {
-    test: /\.(?:m?js|ts)$/,
+    test: /\.(?:[cm]?js|ts)$/,
     enforce: 'post',
     use: [
       {
-        loader: require.resolve('babel-loader'),
+        loader: require.resolve('../babel/webpack-loader'),
         options: {
-          babelrc: false,
-          configFile: false,
-          compact: false,
-          cacheCompression: false,
-          cacheDirectory: findCachePath('babel-loader'),
+          cacheDirectory: findCachePath('babel-dev-server-i18n'),
           cacheIdentifier: JSON.stringify({
-            buildAngular: require('../../package.json').version,
             locale,
             translationIntegrity: localeDescription?.files.map((file) => file.integrity),
           }),
-          plugins,
+          i18n: i18nLoaderOptions,
         },
       },
     ],
@@ -340,340 +410,6 @@ async function setupLocalize(
   }
 
   rules.push(i18nRule);
-
-  // Add a plugin to inject the i18n diagnostics
-  // tslint:disable-next-line: no-non-null-assertion
-  webpackConfig.plugins!.push({
-    apply: (compiler: webpack.Compiler) => {
-      compiler.hooks.thisCompilation.tap('build-angular', compilation => {
-        compilation.hooks.finishModules.tap('build-angular', () => {
-          if (!diagnostics) {
-            return;
-          }
-          for (const diagnostic of diagnostics.messages) {
-            if (diagnostic.type === 'error') {
-              addError(compilation, diagnostic.message);
-            } else {
-              addWarning(compilation, diagnostic.message);
-            }
-          }
-          diagnostics.messages.length = 0;
-        });
-      });
-    },
-  });
-}
-
-/**
- * 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: DevServerBuilderOptions,
-  browserOptions: BrowserBuilderSchema,
-  logger: logging.LoggerApi,
-): WebpackDevServer.Configuration {
-  // Check that the host is either localhost or prints out a message.
-  if (
-    serverOptions.host
-    && !/^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&{logLevel: string} = {
-    host: serverOptions.host,
-    port: serverOptions.port,
-    headers: {
-      'Access-Control-Allow-Origin': '*',
-      ...serverOptions.headers,
-    },
-    historyApiFallback: !!browserOptions.index && {
-      index: `${servePath}/${getIndexOutputFile(browserOptions)}`,
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      rewrites: [
-        {
-          from: new RegExp(`^(?!${servePath})/.*`),
-          to: context => url.format(context.parsedUrl),
-        },
-      ],
-    },
-    stats: false,
-    compress: styles || scripts,
-    watchOptions: {
-      // Using just `--poll` will result in a value of 0 which is very likely not the intention
-      // A value of 0 is falsy and will disable polling rather then enable
-      // 500 ms is a sensible default in this case
-      poll: serverOptions.poll === 0 ? 500 : serverOptions.poll,
-      ignored: serverOptions.poll === undefined ? undefined : /[\\\/]node_modules[\\\/]/,
-    },
-    https: serverOptions.ssl,
-    overlay: {
-      errors: !(styles || scripts),
-      warnings: false,
-    },
-    // inline is always false, because we add live reloading scripts in _addLiveReload when needed
-    inline: false,
-    public: serverOptions.publicHost,
-    allowedHosts: serverOptions.allowedHosts,
-    disableHostCheck: serverOptions.disableHostCheck,
-    publicPath: servePath,
-    hot: serverOptions.hmr,
-    contentBase: false,
-    logLevel: 'silent',
-  };
-
-  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: DevServerBuilderOptions,
-  browserOptions: BrowserBuilderSchema,
-  logger: logging.LoggerApi,
-): string {
-  let servePath = serverOptions.servePath;
-  if (!servePath && servePath !== '') {
-    const defaultPath = _findDefaultServePath(browserOptions.baseHref, browserOptions.deployUrl);
-    if (defaultPath == null) {
-      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(
-  root: string,
-  options: DevServerBuilderOptions,
-  browserOptions: BrowserBuilderSchema,
-  webpackConfig: webpack.Configuration,
-  clientAddress: url.UrlWithStringQuery,
-  logger: logging.LoggerApi,
-) {
-  if (webpackConfig.plugins === undefined) {
-    webpackConfig.plugins = [];
-  }
-
-  // Workaround node shim hoisting issues with live reload client
-  // Only needed in dev server mode to support live reload capabilities in all package managers
-  // Not needed in Webpack 5 - node-libs-browser will not be present in webpack 5
-  let nodeLibsBrowserPath;
-  try {
-    const webpackPath = path.dirname(require.resolve('webpack/package.json'));
-    nodeLibsBrowserPath = require.resolve('node-libs-browser', { paths: [webpackPath] });
-  } catch {}
-  if (nodeLibsBrowserPath) {
-    const nodeLibsBrowser = require(nodeLibsBrowserPath);
-    webpackConfig.plugins.push(
-      new webpack.NormalModuleReplacementPlugin(
-        /^events|url|querystring$/,
-        (resource: { issuer?: string; request: string }) => {
-          if (!resource.issuer) {
-            return;
-          }
-          if (/[\/\\]hot[\/\\]emitter\.js$/.test(resource.issuer)) {
-            if (resource.request === 'events') {
-              resource.request = nodeLibsBrowser.events;
-            }
-          } else if (
-            /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl\.js$/.test(
-              resource.issuer,
-            )
-          ) {
-            switch (resource.request) {
-              case 'url':
-                resource.request = nodeLibsBrowser.url;
-                break;
-              case 'querystring':
-                resource.request = nodeLibsBrowser.querystring;
-                break;
-            }
-          }
-        },
-      ),
-    );
-  }
-
-  // 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.');
-  }
-
-  // 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');
-    sockjsPath = '&sockPath=' + clientAddress.pathname;
-  }
-
-  const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}${sockjsPath}`];
-  if (options.hmr) {
-    logger.warn(tags.stripIndents`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.
-      See https://webpack.js.org/guides/hot-module-replacement for information on working with HMR for Webpack.`);
-
-    entryPoints.push(
-      'webpack/hot/dev-server',
-    );
-  }
-
-  if (typeof webpackConfig.entry !== 'object' || Array.isArray(webpackConfig.entry)) {
-    webpackConfig.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: DevServerBuilderOptions,
-  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: DevServerBuilderOptions,
-  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<DevServerBuilderOptions, DevServerBuilderOutput>(serveWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/index_spec.ts
index ecaa8d98da31..32de590781fb 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/inline-critical-css-optimization_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/inline-critical-css-optimization_spec.ts
new file mode 100644
index 000000000000..d16ef5084b5d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/dev-server/inline-critical-css-optimization_spec.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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';
+import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+import { mergeMap, take, timeout } from 'rxjs/operators';
+import { createArchitect, host } from '../test-utils';
+
+describe('Dev Server Builder inline critical CSS optimization', () => {
+  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 = [];
+
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body { color: #000 }
+      `,
+    });
+  });
+
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { browserTarget: 'app:build:production,inline-critical-css', port: 0 });
+    runs.push(run);
+
+    await run.output.pipe(
+      take(1),
+      timeout(39000),
+      mergeMap(async output => {
+        expect(output.success).toBe(true);
+        const response = await fetch(`${output.baseUrl}/index.html`);
+        expect(await response.text()).toContain(`body{color:#000}`);
+      }),
+    ).toPromise();
+
+  }, 40000);
+});
diff --git a/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts
new file mode 100644
index 000000000000..570d82f23fbc
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts
@@ -0,0 +1,283 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { Architect, BuilderRun } from '@angular-devkit/architect';
+import { tags } from '@angular-devkit/core';
+import { createProxyServer } from 'http-proxy';
+import { HTTPResponse } from 'puppeteer/lib/cjs/puppeteer/api-docs-entry';
+import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser';
+import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
+import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
+import { debounceTime, switchMap, take } from 'rxjs/operators';
+import { createArchitect, host } from '../test-utils';
+
+// tslint:disable-next-line: no-any
+declare const document: any;
+
+interface ProxyInstance {
+  server: typeof createProxyServer extends () => infer R ? R : never;
+  url: string;
+}
+
+let proxyPort = 9100;
+function createProxy(target: string, secure: boolean, ws = true): ProxyInstance {
+  proxyPort++;
+
+  const server = createProxyServer({
+    ws,
+    target,
+    secure,
+    ssl: secure && {
+      key: tags.stripIndents`
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDEBRUsUz4rdcMt
+      CQGLvG3SzUinsmgdgOyTNQNA0eOMyRSrmS8L+F/kSLUnqqu4mzdeqDzo2Xj553jK
+      dRqMCRFGJuGnQ/VIbW2A+ywgrqILuDyF5i4PL1aQW4yJ7TnXfONKfpswQArlN6DF
+      gBYJtoJlf8XD1sOeJpsv/O46/ix/wngQ+GwQQ2cfqxQT0fE9SBCY23VNt3SPUJ3k
+      9etJMvJ9U9GHSb1CFdNQe7Gyx7xdKf1TazB27ElNZEg2aF99if47uRskYjvvFivy
+      7nxGx/ccIwjwNMpk29AsKG++0sn1yTK7tD5Px6aCSVK0BKbdXZS2euJor8hASGBJ
+      3GpVGJvdAgMBAAECggEAapYo8TVCdPdP7ckb4hPP0/R0MVu9aW2VNmZ5ImH+zar5
+      ZmWhQ20HF2bBupP/VB5yeTIaDLNUKO9Iqy4KBWNY1UCHKyC023FFPgFV+V98FctU
+      faqwGOmwtEZToRwxe48ZOISndhEc247oCPyg/x8SwIY9z0OUkwaDFBEAqWtUXxM3
+      /SPpCT5ilLgxnRgVB8Fj5Z0q7ThnxNVOmVC1OSIakEj46PzmMXn1pCKLOCUmAAOQ
+      BnrOZuty2b8b2M/GHsktLZwojQQJmArnIBymTXQTVhaGgKSyOv1qvHLp9L1OJf0/
+      Xm+/TqT6ztzhzlftcObdfQZZ5JuoEwlvyrsGFlA3MQKBgQDiQC3KYMG8ViJkWrv6
+      XNAFEoAjVEKrtirGWJ66YfQ9KSJ7Zttrd1Y1V1OLtq3z4YMH39wdQ8rOD+yR8mWV
+      6Tnsxma6yJXAH8uan8iVbxjIZKF1hnvNCxUoxYmWOmTLcEQMzmxvTzAiR+s6R6Uj
+      9LgGqppt30nM4wnOhOJU6UxqbwKBgQDdy03KidbPZuycJSy1C9AIt0jlrxDsYm+U
+      fZrB6mHEZcgoZS5GbLKinQCdGcgERa05BXvJmNbfZtT5a37YEnbjsTImIhDiBP5P
+      nW36/9a3Vg1svd1KP2206/Bh3gfZbgTsQg4YogXgjf0Uzuvw18btgTtLVpVyeuqz
+      TU3eeF30cwKBgQCN6lvOmapsDEs+T3uhqx4AUH53qp63PmjOSUAnANJGmsq6ROZV
+      HmHAy6nn9Qpf85BRHCXhZWiMoIhvc3As/EINNtWxS6hC/q6jqp4SvcD50cVFBroY
+      /16iWGXZCX+37A+DSOfTWgSDPEFcKRx41UOpStHbITgVgEPieo/NWxlHmQKBgQDX
+      JOLs2RB6V0ilnpnjdPXzvncD9fHgmwvJap24BPeZX3HtXViqD76oZsu1mNCg9EW3
+      zk3pnEyyoDlvSIreZerVq4kN3HWsCVP3Pqr0kz9g0CRtmy8RWr28hjHDfXD3xPUZ
+      iGnMEz7IOHOKv722/liFAprV1cNaLUmFbDNg3jmlaQKBgQDG5WwngPhOHmjTnSml
+      amfEz9a4yEhQqpqgVNW5wwoXOf6DbjL2m/maJh01giThj7inMcbpkZlIclxD0Eu6
+      Lof+ctCeqSAJvaVPmd+nv8Yp26zsF1yM8ax9xXjrIvv9fSbycNveGTDCsNNTiYoW
+      QyvMqmN1kGy20SZbQDD/fLfqBQ==
+      -----END RSA PRIVATE KEY-----
+    `,
+      cert: tags.stripIndents`
+      -----BEGIN CERTIFICATE-----
+      MIIDXTCCAkWgAwIBAgIJALz8gD/gAt0OMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+      BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+      aWRnaXRzIFB0eSBMdGQwHhcNMTgxMDIzMTgyMTQ5WhcNMTkxMDIzMTgyMTQ5WjBF
+      MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+      ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+      CgKCAQEAxAUVLFM+K3XDLQkBi7xt0s1Ip7JoHYDskzUDQNHjjMkUq5kvC/hf5Ei1
+      J6qruJs3Xqg86Nl4+ed4ynUajAkRRibhp0P1SG1tgPssIK6iC7g8heYuDy9WkFuM
+      ie0513zjSn6bMEAK5TegxYAWCbaCZX/Fw9bDniabL/zuOv4sf8J4EPhsEENnH6sU
+      E9HxPUgQmNt1Tbd0j1Cd5PXrSTLyfVPRh0m9QhXTUHuxsse8XSn9U2swduxJTWRI
+      NmhffYn+O7kbJGI77xYr8u58Rsf3HCMI8DTKZNvQLChvvtLJ9ckyu7Q+T8emgklS
+      tASm3V2UtnriaK/IQEhgSdxqVRib3QIDAQABo1AwTjAdBgNVHQ4EFgQUDZBhVKdb
+      3BRhLIhuuE522Vsul0IwHwYDVR0jBBgwFoAUDZBhVKdb3BRhLIhuuE522Vsul0Iw
+      DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABh9WWZwWLgb9/DcTxL72
+      6pI96t4jiF79Q+pPefkaIIi0mE6yodWrTAsBQu9I6bNRaEcCSoiXkP2bqskD/UGg
+      LwUFgSrDOAA3UjdHw3QU5g2NocduG7mcFwA40TB98sOsxsUyYlzSyWzoiQWwPYwb
+      hek1djuWkqPXsTjlj54PTPN/SjTFmo4p5Ip6nbRf2nOREl7v0rJpGbJvXiCMYyd+
+      Zv+j4mRjCGo8ysMR2HjCUGkYReLAgKyyz3M7i8vevJhKslyOmy6Txn4F0nPVumaU
+      DDIy4xXPW1STWfsmSYJfYW3wa0wk+pJQ3j2cTzkPQQ8gwpvM3U9DJl43uwb37v6I
+      7Q==
+      -----END CERTIFICATE-----
+    `,
+    },
+  })
+    .listen(proxyPort);
+
+  return {
+    server,
+    url: `${secure ? 'https' : 'http'}://localhost:${proxyPort}`,
+  };
+}
+
+async function goToPageAndWaitForSockJs(page: Page, url: string): Promise<void> {
+  const socksRequest = `${url.endsWith('/') ? url : url + '/'}sockjs-node/info?t=`;
+
+  await Promise.all([
+    page.waitForResponse((r: HTTPResponse) => r.url().startsWith(socksRequest) && r.status() === 200),
+    page.goto(url),
+  ]);
+}
+
+describe('Dev Server Builder live-reload', () => {
+  const target = { project: 'app', target: 'serve' };
+  // Avoid using port `0` as these tests will behave differrently and tests will pass when they shouldn't.
+  // Port 0 and host 0.0.0.0 have special meaning in dev-server.
+  const overrides = { hmr: false, watch: true, port: 4202, liveReload: true };
+  let architect: Architect;
+  let browser: Browser;
+  let page: Page;
+  let runs: BuilderRun[];
+  let proxy: ProxyInstance | undefined;
+
+  beforeAll(async () => {
+    browser = await puppeteer.launch({
+      // MacOSX users need to set the local binary manually because Chrome has lib files with
+      // spaces in them which Bazel does not support in runfiles
+      // See: https://github.com/angular/angular-cli/pull/17624
+      // tslint:disable-next-line: max-line-length
+      // executablePath: '/Users/<USERNAME>/git/angular-cli/node_modules/puppeteer/.local-chromium/mac-818858/chrome-mac/Chromium.app/Contents/MacOS/Chromium',
+      ignoreHTTPSErrors: true,
+      args: [
+        '--no-sandbox',
+        '--disable-gpu',
+      ],
+    });
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+
+    host.writeMultipleFiles({
+      'src/app/app.component.html': `
+        <p>{{title}}</p>
+      `,
+    });
+
+    runs = [];
+    page = await browser.newPage();
+  });
+
+  afterEach(async () => {
+    proxy?.server.close();
+    proxy = undefined;
+    await host.restore().toPromise();
+    await page.close();
+    await Promise.all(runs.map(r => r.stop()));
+  });
+
+  it('works without proxy', async () => {
+    const run = await architect.scheduleTarget(target, overrides);
+    runs.push(run);
+
+    let buildCount = 0;
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        switchMap(async buildEvent => {
+          expect(buildEvent.success).toBe(true);
+          const url = buildEvent.baseUrl as string;
+          switch (buildCount) {
+            case 0:
+              await goToPageAndWaitForSockJs(page, url);
+              host.replaceInFile('src/app/app.component.ts', `'app'`, `'app-live-reload'`);
+              break;
+            case 1:
+              const innerText = await page.evaluate(() => document.querySelector('p').innerText);
+              expect(innerText).toBe('app-live-reload');
+              break;
+          }
+
+          buildCount++;
+        }),
+        take(2),
+      )
+      .toPromise();
+  }, 30000);
+
+  it('works without http -> http proxy', async () => {
+    const run = await architect.scheduleTarget(target, overrides);
+    runs.push(run);
+
+    let proxy: ProxyInstance | undefined;
+    let buildCount = 0;
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        switchMap(async buildEvent => {
+          expect(buildEvent.success).toBe(true);
+          const url = buildEvent.baseUrl as string;
+          switch (buildCount) {
+            case 0:
+              proxy = createProxy(url, false);
+              await goToPageAndWaitForSockJs(page, proxy.url);
+              host.replaceInFile('src/app/app.component.ts', `'app'`, `'app-live-reload'`);
+              break;
+            case 1:
+              const innerText = await page.evaluate(() => document.querySelector('p').innerText);
+              expect(innerText).toBe('app-live-reload');
+              break;
+          }
+
+          buildCount++;
+        }),
+        take(2),
+      )
+      .toPromise();
+  }, 30000);
+
+  it('works without https -> http proxy', async () => {
+    const run = await architect.scheduleTarget(target, overrides);
+    runs.push(run);
+
+    let proxy: ProxyInstance | undefined;
+    let buildCount = 0;
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        switchMap(async buildEvent => {
+          expect(buildEvent.success).toBe(true);
+          const url = buildEvent.baseUrl as string;
+          switch (buildCount) {
+            case 0:
+              proxy = createProxy(url, true);
+              await goToPageAndWaitForSockJs(page, proxy.url);
+              host.replaceInFile('src/app/app.component.ts', `'app'`, `'app-live-reload'`);
+              break;
+            case 1:
+              const innerText = await page.evaluate(() => document.querySelector('p').innerText);
+              expect(innerText).toBe('app-live-reload');
+              break;
+          }
+
+          buildCount++;
+        }),
+        take(2),
+      )
+      .toPromise();
+  }, 30000);
+
+  it('works without https -> http proxy without websockets (dotnet emulation)', async () => {
+    const run = await architect.scheduleTarget(target, overrides);
+    runs.push(run);
+
+    let proxy: ProxyInstance | undefined;
+    let buildCount = 0;
+
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        switchMap(async buildEvent => {
+          expect(buildEvent.success).toBe(true);
+          const url = buildEvent.baseUrl as string;
+          switch (buildCount) {
+            case 0:
+              proxy = createProxy(url, true, false);
+              await goToPageAndWaitForSockJs(page, proxy.url);
+              await page.waitForResponse((response: HTTPResponse) => response.url().includes('xhr_streaming') && response.status() === 200);
+              host.replaceInFile('src/app/app.component.ts', `'app'`, `'app-live-reload'`);
+              break;
+            case 1:
+              const innerText = await page.evaluate(() => document.querySelector('p').innerText);
+              expect(innerText).toBe('app-live-reload');
+              break;
+          }
+
+          buildCount++;
+        }),
+        take(2),
+      )
+      .toPromise();
+  }, 30000);
+});
diff --git a/packages/angular_devkit/build_angular/src/dev-server/proxy_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/proxy_spec.ts
index 684e639cbe33..e83fb0628431 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/proxy_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/proxy_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/public-host_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/public-host_spec.ts
index b0389eb2a80f..9a3be224ac54 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/public-host_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/public-host_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 2c2c0bf15279..077f762c9576 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,7 @@
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "Target to serve.",
+      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "port": {
@@ -105,7 +105,7 @@
       "x-deprecated": "No longer has an effect."
     },
     "optimization": {
-      "description": "Enables optimization of the build output.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, tree-shaking and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
       "x-user-analytics": 16,
       "oneOf": [
         {
@@ -137,29 +137,29 @@
       "x-deprecated": "Use the \"aot\" option in the browser builder instead."
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
       "oneOf": [
         {
           "type": "object",
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },
@@ -173,12 +173,12 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Use a separate bundle containing only vendor libraries.",
+      "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
       "x-deprecated": "Use the \"vendorChunk\" option in the browser builder instead."
     },
     "commonChunk": {
       "type": "boolean",
-      "description": "Use a separate bundle containing code used across multiple bundles.",
+      "description": "Generate a seperate bundle containing code used across multiple bundles.",
       "x-deprecated": "Use the \"commonChunk\" option in the browser builder instead."
     },
     "baseHref": {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/serve-path_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/serve-path_spec.ts
index 6edc51abeb51..acf779ff97fe 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/serve-path_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/serve-path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts
index ca3ec505d318..c14375efb0d8 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -102,8 +102,8 @@ describe('Dev Server Builder ssl', () => {
 
     const overrides = {
       ssl: true,
-      sslKey: '../ssl/server.key',
-      sslCert: '../ssl/server.crt',
+      sslKey: 'ssl/server.key',
+      sslCert: 'ssl/server.crt',
     };
 
     const run = await architect.scheduleTarget(target, overrides);
diff --git a/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts
index c8ec85604300..e50e5412d5dd 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
-import { logging } from '@angular-devkit/core';
+import { logging, normalize, virtualFs } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
 import { createArchitect, host } from '../test-utils';
 
@@ -112,4 +112,30 @@ describe('Dev Server Builder', () => {
     expect(response.headers.get('X-Header')).toBe('Hello World');
   }, 30000);
 
+  it('uses source locale when not localizing', async () => {
+    const config = host.scopedSync().read(normalize('angular.json'));
+    const jsonConfig = JSON.parse(virtualFs.fileBufferToString(config));
+    const applicationProject = jsonConfig.projects.app;
+
+    applicationProject.i18n = { sourceLocale: 'fr' };
+
+    host.writeMultipleFiles({
+      'angular.json': JSON.stringify(jsonConfig),
+    });
+
+    const architect = (await createArchitect(host.root())).architect;
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result;
+    expect(output.success).toBe(true);
+
+    const indexResponse = await fetch('http://localhost:4200/index.html');
+    expect(await indexResponse.text()).toContain('lang="fr"');
+    const vendorResponse = await fetch('http://localhost:4200/vendor.js');
+    const vendorText = await vendorResponse.text();
+    expect(vendorText).toContain('fr');
+    expect(vendorText).toContain('octobre');
+
+    await run.stop();
+  });
+
 });
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 71a59633ba32..6b3556f50350 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -21,7 +21,7 @@ import { ExecutionTransformer } from '../transforms';
 import { createI18nOptions } from '../utils/i18n-options';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
-import { getAotConfig, getCommonConfig, getStatsConfig } from '../webpack/configs';
+import { getAotConfig, getBrowserConfig, getCommonConfig, getStatsConfig } from '../webpack/configs';
 import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Format, Schema } from './schema';
 
@@ -37,12 +37,16 @@ function getI18nOutfile(format: string | undefined) {
     case 'xlf2':
     case 'xliff2':
       return 'messages.xlf';
+    case 'json':
+      return 'messages.json';
+    case 'arb':
+      return 'messages.arb';
     default:
       throw new Error(`Unsupported format "${format}"`);
   }
 }
 
-async function getSerializer(format: Format, sourceLocale: string, basePath: string, useLegacyIds = true) {
+async function getSerializer(format: Format, sourceLocale: string, basePath: string, useLegacyIds: boolean) {
   switch (format) {
     case Format.Xmb:
       const { XmbTranslationSerializer } =
@@ -65,13 +69,62 @@ async function getSerializer(format: Format, sourceLocale: string, basePath: str
 
       // tslint:disable-next-line: no-any
       return new Xliff2TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {});
+    case Format.Json:
+      const { SimpleJsonTranslationSerializer } =
+        await import('@angular/localize/src/tools/src/extract/translation_files/json_translation_serializer');
+
+      // tslint:disable-next-line: no-any
+      return new SimpleJsonTranslationSerializer(sourceLocale);
+    case Format.Arb:
+      const { ArbTranslationSerializer } =
+        await import('@angular/localize/src/tools/src/extract/translation_files/arb_translation_serializer');
+
+      const fileSystem = {
+        relative(from: string, to: string): string {
+          return path.relative(from, to);
+        },
+      };
+
+      // tslint:disable-next-line: no-any
+      return new ArbTranslationSerializer(sourceLocale, basePath as any, fileSystem as any);
+  }
+}
+
+function normalizeFormatOption(options: ExtractI18nBuilderOptions) {
+  let format;
+  if (options.i18nFormat !== Format.Xlf) {
+    format = options.i18nFormat;
+  } else {
+    format = options.format;
+  }
+
+  switch (format) {
+    case Format.Xlf:
+    case Format.Xlif:
+    case Format.Xliff:
+      format = Format.Xlf;
+      break;
+    case Format.Xlf2:
+    case Format.Xliff2:
+      format = Format.Xlf2;
+      break;
+    case Format.Json:
+      format = Format.Json;
+      break;
+    case Format.Arb:
+      format = Format.Arb;
+      break;
+    case undefined:
+      format = Format.Xlf;
+      break;
   }
+
+  return format;
 }
 
-class InMemoryOutputPlugin {
+class NoEmitPlugin {
   apply(compiler: webpack.Compiler): void {
-    // tslint:disable-next-line:no-any
-    compiler.outputFileSystem = new (webpack as any).MemoryOutputFileSystem();
+    compiler.hooks.shouldEmit.tap('angular-no-emit', () => false);
   }
 }
 
@@ -91,27 +144,10 @@ export async function execute(
     await context.getBuilderNameForTarget(browserTarget),
   );
 
-  if (options.i18nFormat !== Format.Xlf) {
-    options.format = options.i18nFormat;
-  }
-
-  switch (options.format) {
-    case Format.Xlf:
-    case Format.Xlif:
-    case Format.Xliff:
-      options.format = Format.Xlf;
-      break;
-    case Format.Xlf2:
-    case Format.Xliff2:
-      options.format = Format.Xlf2;
-      break;
-    case undefined:
-      options.format = Format.Xlf;
-      break;
-  }
+  const format = normalizeFormatOption(options);
 
   // We need to determine the outFile name so that AngularCompiler can retrieve it.
-  let outFile = options.outFile || getI18nOutfile(options.format);
+  let outFile = options.outFile || getI18nOutfile(format);
   if (options.outputPath) {
     // AngularCompilerPlugin doesn't support genDir so we have to adjust outFile instead.
     outFile = path.join(options.outputPath, outFile);
@@ -126,15 +162,13 @@ export async function execute(
   const i18n = createI18nOptions(metadata);
 
   let usingIvy = false;
+  let useLegacyIds = true;
 
   const ivyMessages: LocalizeMessage[] = [];
   const { config, projectRoot } = await generateBrowserWebpackConfigFromContext(
     {
       ...browserOptions,
-      optimization: {
-        scripts: false,
-        styles: false,
-      },
+      optimization: false,
       sourceMap: {
         scripts: true,
         styles: false,
@@ -142,7 +176,7 @@ export async function execute(
       },
       buildOptimizer: false,
       i18nLocale: options.i18nLocale || i18n.sourceLocale,
-      i18nFormat: options.format,
+      i18nFormat: format,
       i18nFile: outFile,
       aot: true,
       progress: options.progress,
@@ -150,11 +184,16 @@ export async function execute(
       scripts: [],
       styles: [],
       deleteOutputPath: false,
+      extractLicenses: false,
+      subresourceIntegrity: false,
     },
     context,
     (wco) => {
       const isIvyApplication = wco.tsConfig.options.enableIvy !== false;
 
+      // Default value for legacy message ids is currently true
+      useLegacyIds = wco.tsConfig.options.enableI18nLegacyMessageIdFormat ?? true;
+
       // Ivy extraction is the default for Ivy applications.
       usingIvy = (isIvyApplication && options.ivy === undefined) || !!options.ivy;
 
@@ -172,8 +211,9 @@ export async function execute(
       }
 
       const partials = [
-        { plugins: [new InMemoryOutputPlugin()] },
+        { plugins: [new NoEmitPlugin()] },
         getCommonConfig(wco),
+        getBrowserConfig(wco),
         // Only use VE extraction if not using Ivy
         getAotConfig(wco, !usingIvy),
         getStatsConfig(wco),
@@ -240,11 +280,38 @@ export async function execute(
     return webpackResult;
   }
 
+  const basePath = config.context || projectRoot;
+
+  const { checkDuplicateMessages } = await import(
+    // tslint:disable-next-line: trailing-comma
+    '@angular/localize/src/tools/src/extract/duplicates'
+  );
+
+  // The filesystem is used to create a relative path for each file
+  // from the basePath.  This relative path is then used in the error message.
+  const checkFileSystem = {
+    relative(from: string, to: string): string {
+      return path.relative(from, to);
+    },
+  };
+  const diagnostics = checkDuplicateMessages(
+    // tslint:disable-next-line: no-any
+    checkFileSystem as any,
+    ivyMessages,
+    'warning',
+    // tslint:disable-next-line: no-any
+    basePath as any,
+  );
+  if (diagnostics.messages.length > 0) {
+    context.logger.warn(diagnostics.formatDiagnostics(''));
+  }
+
   // Serialize all extracted messages
   const serializer = await getSerializer(
-    options.format,
+    format,
     i18n.sourceLocale,
-    config.context || projectRoot,
+    basePath,
+    useLegacyIds,
   );
   const content = serializer.serialize(ivyMessages);
 
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/ivy-extract-loader.ts b/packages/angular_devkit/build_angular/src/extract-i18n/ivy-extract-loader.ts
index 8cf600f93f72..07042e18d808 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/ivy-extract-loader.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/ivy-extract-loader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 5beb6e262b0b..79739483be7c 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
@@ -6,7 +6,7 @@
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "Target to extract from.",
+      "description": "A browser builder target to extract i18n messages in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "format": {
@@ -19,7 +19,9 @@
         "xlif",
         "xliff",
         "xlf2",
-        "xliff2"
+        "xliff2",
+        "json",
+        "arb"
       ]
     },
     "i18nFormat": {
@@ -33,7 +35,9 @@
         "xlif",
         "xliff",
         "xlf2",
-        "xliff2"
+        "xliff2",
+        "json",
+        "arb"
       ]
     },
     "i18nLocale": {
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts b/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts
index 9746133a07ef..67a5daa20c8b 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -39,6 +39,18 @@ describe('Extract i18n Target', () => {
     }
   }, 30000);
 
+  it('does not emit the application files', async () => {
+    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(host.scopedSync().exists(normalize('dist/app/main.js'))).toBeFalse();
+  }, 30000);
+
   it('shows errors', async () => {
     const logger = new logging.Logger('');
     const logs: string[] = [];
@@ -126,4 +138,29 @@ describe('Extract i18n Target', () => {
     expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
       .toMatch(/i18n test/);
   }, 30000);
+
+  // DISABLED_FOR_VE
+  (veEnabled ? xit : it)('issues warnings for duplicate message identifiers', async () => {
+    host.appendToFile(
+      'src/app/app.component.ts',
+      'const c = $localize`:@@message-2:message contents`; const d = $localize`:@@message-2:different message contents`;',
+    );
+
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe((e) => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, undefined, { logger });
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(host.scopedSync().exists(extractionFile)).toBe(true);
+
+    const fullLog = logs.join();
+    expect(fullLog).toContain(
+      'Duplicate messages with id',
+    );
+
+  }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index 83613150fc33..dc462532a654 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
index ab92ac8fd261..934598f55fdb 100644
--- a/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
+++ b/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -169,4 +169,31 @@ describe('Karma Builder code coverage', () => {
     await run.stop();
 
   }, 120000);
+
+  it('is able to process coverage plugin provided as string', async () => {
+    host.replaceInFile('karma.conf.js', /plugins: \[.+?\]/s, `plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+      'karma-coverage', // instead of require('karma-coverage')
+    ]`);
+    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
+
+    const {success} = await run.result;
+    expect(success).toBe(true);
+    await run.stop();
+  }, 120000);
+
+  it('is able to process coverage plugins provided as string karma-*', async () => {
+    host.replaceInFile('karma.conf.js', /plugins: \[.+?\]/s, `plugins: [
+      'karma-*',
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ]`);
+    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
+
+    const {success} = await run.result;
+    expect(success).toBe(true);
+    await run.stop();
+  }, 120000);
 });
diff --git a/packages/angular_devkit/build_angular/src/karma/find-tests.ts b/packages/angular_devkit/build_angular/src/karma/find-tests.ts
index 17f26197b9da..b02d22aaf3d4 100644
--- a/packages/angular_devkit/build_angular/src/karma/find-tests.ts
+++ b/packages/angular_devkit/build_angular/src/karma/find-tests.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 9a4cc9587ffd..de12f6d8e66b 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts b/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts
index fd73eb706184..c05b56bae119 100644
--- a/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts
+++ b/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index f3402b9df894..7b2583982c31 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -67,7 +67,7 @@
       "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.",
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
       "default": true,
       "oneOf": [
         {
@@ -75,17 +75,17 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },
@@ -98,7 +98,8 @@
     },
     "progress": {
       "type": "boolean",
-      "description": "Log progress to the console while building."
+      "description": "Log progress to the console while building.",
+      "default": true
     },
     "watch": {
       "type": "boolean",
@@ -237,6 +238,7 @@
             },
             "bundleName": {
               "type": "string",
+              "pattern": "^[\\w\\-.]*$",
               "description": "The bundle name for this extra entry point."
             },
             "inject": {
diff --git a/packages/angular_devkit/build_angular/src/karma/selected_spec.ts b/packages/angular_devkit/build_angular/src/karma/selected_spec.ts
index 0b4de133a0fa..1ea72fa40d50 100644
--- a/packages/angular_devkit/build_angular/src/karma/selected_spec.ts
+++ b/packages/angular_devkit/build_angular/src/karma/selected_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/karma/works_spec.ts b/packages/angular_devkit/build_angular/src/karma/works_spec.ts
index ad749f97fb1e..24feab4d6007 100644
--- a/packages/angular_devkit/build_angular/src/karma/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/karma/works_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/ng-packagr/index.ts b/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
index d8e2fa24262c..8258eebda601 100644
--- a/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
+++ b/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/ng-packagr/works_spec.ts b/packages/angular_devkit/build_angular/src/ng-packagr/works_spec.ts
index 550a92f9ef9e..a331e50af15f 100644
--- a/packages/angular_devkit/build_angular/src/ng-packagr/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/ng-packagr/works_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 755324d83c78..541e586b30d7 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,9 +14,11 @@ import {
 import { JsonObject, tags } from '@angular-devkit/core';
 import { resolve } from 'path';
 import * as url from 'url';
+import { DevServerBuilderOptions } from '../dev-server/index';
 import { runModuleAsObservableFork } from '../utils';
 import { Schema as ProtractorBuilderOptions } from './schema';
 
+
 interface JasmineNodeOpts {
   jasmineNodeOpts: {
     grep?: string;
@@ -105,7 +107,11 @@ export async function execute(
     const target = targetFromTargetString(options.devServerTarget);
     const serverOptions = await context.getTargetOptions(target);
 
-    const overrides: Record<string, string | number | boolean> = { watch: false };
+    const overrides = {
+      watch: false,
+      liveReload: false,
+    } as DevServerBuilderOptions;
+
     if (options.host !== undefined) {
       overrides.host = options.host;
     } else if (typeof serverOptions.host === 'string') {
diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json
index c4fd14eff06a..ff431254bdfe 100644
--- a/packages/angular_devkit/build_angular/src/protractor/schema.json
+++ b/packages/angular_devkit/build_angular/src/protractor/schema.json
@@ -10,7 +10,7 @@
     },
     "devServerTarget": {
       "type": "string",
-      "description": "Dev server target to run tests against.",
+      "description": "A dev-server builder target to run tests against in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
       "pattern": "^([^:\\s]+:[^:\\s]+(:[^\\s]+)?)?$"
     },
     "grep": {
diff --git a/packages/angular_devkit/build_angular/src/protractor/works_spec.ts b/packages/angular_devkit/build_angular/src/protractor/works_spec.ts
index 011b936fbfd5..212a485538a9 100644
--- a/packages/angular_devkit/build_angular/src/protractor/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/works_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/server/base_spec.ts b/packages/angular_devkit/build_angular/src/server/base_spec.ts
index 9923d1ffc36b..4d880741cca1 100644
--- a/packages/angular_devkit/build_angular/src/server/base_spec.ts
+++ b/packages/angular_devkit/build_angular/src/server/base_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/server/external_dependencies_spec.ts b/packages/angular_devkit/build_angular/src/server/external_dependencies_spec.ts
index e8ddba737bfa..30ecdc812b88 100644
--- a/packages/angular_devkit/build_angular/src/server/external_dependencies_spec.ts
+++ b/packages/angular_devkit/build_angular/src/server/external_dependencies_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index f19ea4d01e27..74cf6d41aeda 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -28,7 +28,7 @@ import {
   getStatsConfig,
   getStylesConfig,
 } from '../webpack/configs';
-import { createWebpackLoggingCallback } from '../webpack/utils/stats';
+import { webpackStatsLogger } from '../webpack/utils/stats';
 import { Schema as ServerBuilderOptions } from './schema';
 
 // If success is true, outputPath should be set.
@@ -76,7 +76,7 @@ export function execute(
       context.logger.warn(tags.stripIndent`
       Warning: Turning off 'bundleDependencies' with Ivy may result in undefined behaviour
       unless 'node_modules' are transformed using the standalone Angular compatibility compiler (NGCC).
-      See: http://v9.angular.io/guide/ivy#ivy-and-universal-app-shell
+      See: https://angular.io/guide/ivy#ivy-and-universal-app-shell
     `);
     }
   }
@@ -85,34 +85,39 @@ export function execute(
     concatMap(({ config, i18n }) => {
       return runWebpack(config, context, {
         webpackFactory: require('webpack') as typeof webpack,
-        logging: createWebpackLoggingCallback(!!options.verbose, context.logger),
+        logging: (stats, config) => {
+          if (options.verbose) {
+            context.logger.info(stats.toString(config.stats));
+          }
+        },
       }).pipe(
         concatMap(async output => {
           const { emittedFiles = [], webpackStats } = output;
-          if (!output.success || !i18n.shouldInline) {
-            return output;
-          }
-
           if (!webpackStats) {
             throw new Error('Webpack stats build result is required.');
           }
 
-          outputPaths = ensureOutputPaths(baseOutputPath, i18n);
-
-          const success = await i18nInlineEmittedFiles(
-            context,
-            emittedFiles,
-            i18n,
-            baseOutputPath,
-            Array.from(outputPaths.values()),
-            [],
-            // tslint:disable-next-line: no-non-null-assertion
-            webpackStats.outputPath!,
-            target <= ScriptTarget.ES5,
-            options.i18nMissingTranslation,
-          );
-
-          return { output, success };
+          let success = output.success;
+          if (success && i18n.shouldInline) {
+            outputPaths = ensureOutputPaths(baseOutputPath, i18n);
+
+            success = await i18nInlineEmittedFiles(
+              context,
+              emittedFiles,
+              i18n,
+              baseOutputPath,
+              Array.from(outputPaths.values()),
+              [],
+              // tslint:disable-next-line: no-non-null-assertion
+              webpackStats.outputPath!,
+              target <= ScriptTarget.ES5,
+              options.i18nMissingTranslation,
+            );
+          }
+
+          webpackStatsLogger(context.logger, webpackStats, config);
+
+          return { ...output, success };
         }),
       );
     }),
diff --git a/packages/angular_devkit/build_angular/src/server/resources-output-path_spec.ts b/packages/angular_devkit/build_angular/src/server/resources-output-path_spec.ts
index 643f1b272cc9..31c5df9e1048 100644
--- a/packages/angular_devkit/build_angular/src/server/resources-output-path_spec.ts
+++ b/packages/angular_devkit/build_angular/src/server/resources-output-path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index b62571479787..6eac23815460 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -29,7 +29,7 @@
       "additionalProperties": false
     },
     "optimization": {
-      "description": "Enables optimization of the build output.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
       "x-user-analytics": 16,
       "default": false,
       "oneOf": [
@@ -72,7 +72,7 @@
       "default": ""
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
       "default": true,
       "oneOf": [
         {
@@ -80,22 +80,22 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },
@@ -117,7 +117,8 @@
     },
     "progress": {
       "type": "boolean",
-      "description": "Log progress to the console while building."
+      "description": "Log progress to the console while building.",
+      "default": true
     },
     "i18nFile": {
       "type": "string",
@@ -141,6 +142,7 @@
       "default": "warning"
     },
     "localize": {
+      "description": "Translate the bundles in one or more locales.",
       "oneOf": [
         {
           "type": "boolean",
@@ -258,10 +260,12 @@
           "type": "object",
           "properties": {
             "src": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "replaceWith": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -274,10 +278,12 @@
           "type": "object",
           "properties": {
             "replace": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "with": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/test-utils.ts b/packages/angular_devkit/build_angular/src/test-utils.ts
index 9a1ae6f738f9..65fc9426d21a 100644
--- a/packages/angular_devkit/build_angular/src/test-utils.ts
+++ b/packages/angular_devkit/build_angular/src/test-utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -81,6 +81,15 @@ export async function browserBuild(
   const output = (await run.result) as BrowserBuilderOutput;
   expect(output.success).toBe(true);
 
+  if (!output.success) {
+    await run.stop();
+
+    return {
+      output,
+      files: {},
+    };
+  }
+
   expect(output.outputPaths[0]).not.toBeUndefined();
   const outputPath = normalize(output.outputPaths[0]);
 
diff --git a/packages/angular_devkit/build_angular/src/testing/builder-harness.ts b/packages/angular_devkit/build_angular/src/testing/builder-harness.ts
new file mode 100644
index 000000000000..9234d0cb4799
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/testing/builder-harness.ts
@@ -0,0 +1,465 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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,
+  BuilderHandlerFn,
+  BuilderInfo,
+  BuilderOutput,
+  BuilderOutputLike,
+  BuilderProgressReport,
+  BuilderRun,
+  ScheduleOptions,
+  Target,
+  fromAsyncIterable,
+  isBuilderOutput,
+} from '@angular-devkit/architect';
+import { WorkspaceHost } from '@angular-devkit/architect/node';
+import { TestProjectHost } from '@angular-devkit/architect/testing';
+import { analytics, getSystemPath, join, json, logging, normalize } from '@angular-devkit/core';
+import { Observable, Subject, from as observableFrom, of as observableOf } from 'rxjs';
+import { catchError, finalize, first, map, mergeMap, shareReplay } from 'rxjs/operators';
+import { BuilderWatcherFactory, WatcherNotifier } from './file-watching';
+
+export interface BuilderHarnessExecutionResult<T extends BuilderOutput = BuilderOutput> {
+  result?: T;
+  error?: Error;
+  logs: readonly logging.LogEntry[];
+}
+
+export interface BuilderHarnessExecutionOptions {
+  configuration: string;
+  outputLogsOnFailure: boolean;
+  outputLogsOnException: boolean;
+  useNativeFileWatching: boolean;
+}
+
+export class BuilderHarness<T> {
+  private readonly builderInfo: BuilderInfo;
+  private schemaRegistry = new json.schema.CoreSchemaRegistry();
+  private projectName = 'test';
+  private projectMetadata: Record<string, unknown> = { root: '.', sourceRoot: 'src' };
+  private targetName?: string;
+  private options = new Map<string | null, T>();
+  private builderTargets = new Map<
+    string,
+    // tslint:disable-next-line: no-any
+    { handler: BuilderHandlerFn<any>; info: BuilderInfo; options: json.JsonObject }
+  >();
+  private watcherNotifier?: WatcherNotifier;
+
+  constructor(
+    private readonly builderHandler: BuilderHandlerFn<T & json.JsonObject>,
+    private readonly host: TestProjectHost,
+    builderInfo?: Partial<BuilderInfo>,
+  ) {
+    // Generate default pseudo builder info for test purposes
+    this.builderInfo = {
+      builderName: builderHandler.name,
+      description: '',
+      optionSchema: true,
+      ...builderInfo,
+    };
+
+    this.schemaRegistry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
+  }
+
+  useProject(name: string, metadata: Record<string, unknown> = {}): this {
+    if (!name) {
+      throw new Error('Project name cannot be an empty string.');
+    }
+
+    this.projectName = name;
+    this.projectMetadata = metadata;
+
+    return this;
+  }
+
+  useTarget(name: string, baseOptions: T): this {
+    if (!name) {
+      throw new Error('Target name cannot be an empty string.');
+    }
+
+    this.targetName = name;
+    this.options.set(null, baseOptions);
+
+    return this;
+  }
+
+  withConfiguration(configuration: string, options: T): this {
+    this.options.set(configuration, options);
+
+    return this;
+  }
+
+  withBuilderTarget<O>(
+    target: string,
+    handler: BuilderHandlerFn<O & json.JsonObject>,
+    options?: O,
+    info?: Partial<BuilderInfo>,
+  ): this {
+    this.builderTargets.set(target, {
+      handler,
+      options: options || {},
+      info: { builderName: handler.name, description: '', optionSchema: true, ...info },
+    });
+
+    return this;
+  }
+
+  execute(
+    options: Partial<BuilderHarnessExecutionOptions> = {},
+  ): Observable<BuilderHarnessExecutionResult> {
+    const {
+      configuration,
+      outputLogsOnException = true,
+      outputLogsOnFailure = true,
+      useNativeFileWatching = false,
+    } = options;
+
+    const targetOptions = {
+      ...this.options.get(null),
+      ...((configuration && this.options.get(configuration)) ?? {}),
+    };
+
+    if (!useNativeFileWatching) {
+      if (this.watcherNotifier) {
+        throw new Error('Only one harness execution at a time is supported.');
+      }
+      this.watcherNotifier = new WatcherNotifier();
+    }
+
+    const contextHost: ContextHost = {
+      findBuilderByTarget: async (project, target) => {
+        this.validateProjectName(project);
+        if (target === this.targetName) {
+          return {
+            info: this.builderInfo,
+            handler: this.builderHandler as BuilderHandlerFn<json.JsonObject>,
+          };
+        }
+
+        const builderTarget = this.builderTargets.get(target);
+        if (builderTarget) {
+          return { info: builderTarget.info, handler: builderTarget.handler };
+        }
+
+        throw new Error('Project target does not exist.');
+      },
+      async getBuilderName(project, target) {
+        return (await this.findBuilderByTarget(project, target)).info.builderName;
+      },
+      getMetadata: async (project) => {
+        this.validateProjectName(project);
+
+        return this.projectMetadata as json.JsonObject;
+      },
+      getOptions: async (project, target, configuration) => {
+        this.validateProjectName(project);
+        if (target === this.targetName) {
+          return this.options.get(configuration ?? null) ?? {};
+        } else if (configuration !== undefined) {
+          // Harness builder targets currently do not support configurations
+          return {};
+        } else {
+          return (this.builderTargets.get(target)?.options as json.JsonObject) || {};
+        }
+      },
+      hasTarget: async (project, target) => {
+        this.validateProjectName(project);
+
+        return this.targetName === target || this.builderTargets.has(target);
+      },
+      validate: async (options, builderName) => {
+        let schema;
+        if (builderName === this.builderInfo.builderName) {
+          schema = this.builderInfo.optionSchema;
+        } else {
+          for (const [, value] of this.builderTargets) {
+            if (value.info.builderName === builderName) {
+              schema = value.info.optionSchema;
+              break;
+            }
+          }
+        }
+
+        const validator = await this.schemaRegistry.compile(schema ?? true).toPromise();
+        const { data } = await validator(options).toPromise();
+
+        return data as json.JsonObject;
+      },
+    };
+    const context = new HarnessBuilderContext(
+      this.builderInfo,
+      getSystemPath(this.host.root()),
+      contextHost,
+      useNativeFileWatching ? undefined : this.watcherNotifier,
+    );
+    if (this.targetName !== undefined) {
+      context.target = {
+        project: this.projectName,
+        target: this.targetName,
+        configuration: configuration as string,
+      };
+    }
+
+    const logs: logging.LogEntry[] = [];
+    context.logger.subscribe((e) => logs.push(e));
+
+    return this.schemaRegistry.compile(this.builderInfo.optionSchema).pipe(
+      mergeMap((validator) => validator(targetOptions)),
+      map((validationResult) => validationResult.data),
+      mergeMap((data) =>
+        convertBuilderOutputToObservable(this.builderHandler(data as T & json.JsonObject, context)),
+      ),
+      map((buildResult) => ({ result: buildResult, error: undefined })),
+      catchError((error) => {
+        if (outputLogsOnException) {
+          // tslint:disable-next-line: no-console
+          console.error(logs.map((entry) => entry.message).join('\n'));
+          // tslint:disable-next-line: no-console
+          console.error(error);
+        }
+
+        return observableOf({ result: undefined, error });
+      }),
+      map(({ result, error }) => {
+        if (outputLogsOnFailure && result?.success === false && logs.length > 0) {
+          // tslint:disable-next-line: no-console
+          console.error(logs.map((entry) => entry.message).join('\n'));
+        }
+
+        // Capture current logs and clear for next
+        const currentLogs = logs.slice();
+        logs.length = 0;
+
+        return { result, error, logs: currentLogs };
+      }),
+      finalize(() => {
+        this.watcherNotifier = undefined;
+
+        for (const teardown of context.teardowns) {
+          teardown();
+        }
+      }),
+    );
+  }
+
+  async executeOnce(
+    options?: Partial<BuilderHarnessExecutionOptions>,
+  ): Promise<BuilderHarnessExecutionResult> {
+    // Return the first result
+    return this.execute(options).pipe(first()).toPromise();
+  }
+
+  async appendToFile(path: string, content: string): Promise<void> {
+    await this.writeFile(path, this.readFile(path).concat(content));
+  }
+
+  async writeFile(path: string, content: string | Buffer): Promise<void> {
+    this.host
+      .scopedSync()
+      .write(normalize(path), typeof content === 'string' ? Buffer.from(content) : content);
+
+    this.watcherNotifier?.notify([
+      { path: getSystemPath(join(this.host.root(), path)), type: 'modified' },
+    ]);
+  }
+
+  async writeFiles(files: Record<string, string | Buffer>): Promise<void> {
+    const watchEvents = this.watcherNotifier
+      ? ([] as { path: string; type: 'modified' | 'deleted' }[])
+      : undefined;
+
+    for (const [path, content] of Object.entries(files)) {
+      this.host
+        .scopedSync()
+        .write(normalize(path), typeof content === 'string' ? Buffer.from(content) : content);
+
+      watchEvents?.push({ path: getSystemPath(join(this.host.root(), path)), type: 'modified' });
+    }
+
+    if (watchEvents) {
+      this.watcherNotifier?.notify(watchEvents);
+    }
+  }
+
+  async removeFile(path: string): Promise<void> {
+    this.host.scopedSync().delete(normalize(path));
+
+    this.watcherNotifier?.notify([
+      { path: getSystemPath(join(this.host.root(), path)), type: 'deleted' },
+    ]);
+  }
+
+  async modifyFile(
+    path: string,
+    modifier: (content: string) => string | Promise<string>,
+  ): Promise<void> {
+    const content = this.readFile(path);
+    await this.writeFile(path, await modifier(content));
+
+    this.watcherNotifier?.notify([
+      { path: getSystemPath(join(this.host.root(), path)), type: 'modified' },
+    ]);
+  }
+
+  hasFile(path: string): boolean {
+    return this.host.scopedSync().exists(normalize(path));
+  }
+
+  hasFileMatch(directory: string, pattern: RegExp): boolean {
+    return this.host.scopedSync()
+      .list(normalize(directory))
+      .some(name => pattern.test(name));
+  }
+
+  readFile(path: string): string {
+    const content = this.host.scopedSync().read(normalize(path));
+
+    return Buffer.from(content).toString('utf8');
+  }
+
+  private validateProjectName(name: string): void {
+    if (name !== this.projectName) {
+      throw new Error(`Project "${name}" does not exist.`);
+    }
+  }
+}
+
+interface ContextHost extends WorkspaceHost {
+  findBuilderByTarget(
+    project: string,
+    target: string,
+  ): Promise<{ info: BuilderInfo; handler: BuilderHandlerFn<json.JsonObject> }>;
+  validate(options: json.JsonObject, builderName: string): Promise<json.JsonObject>;
+}
+
+class HarnessBuilderContext implements BuilderContext {
+  id = Math.trunc(Math.random() * 1000000);
+  logger = new logging.Logger(`builder-harness-${this.id}`);
+  workspaceRoot: string;
+  currentDirectory: string;
+  target?: Target;
+
+  teardowns: (() => Promise<void> | void)[] = [];
+
+  constructor(
+    public builder: BuilderInfo,
+    basePath: string,
+    private readonly contextHost: ContextHost,
+    public readonly watcherFactory: BuilderWatcherFactory | undefined,
+  ) {
+    this.workspaceRoot = this.currentDirectory = basePath;
+  }
+
+  get analytics(): analytics.Analytics {
+    // Can be undefined even though interface does not allow it
+    return (undefined as unknown) as analytics.Analytics;
+  }
+
+  addTeardown(teardown: () => Promise<void> | void): void {
+    this.teardowns.push(teardown);
+  }
+
+  async getBuilderNameForTarget(target: Target): Promise<string> {
+    return this.contextHost.getBuilderName(target.project, target.target);
+  }
+
+  async getProjectMetadata(targetOrName: Target | string): Promise<json.JsonObject> {
+    const project = typeof targetOrName === 'string' ? targetOrName : targetOrName.project;
+
+    return this.contextHost.getMetadata(project);
+  }
+
+  async getTargetOptions(target: Target): Promise<json.JsonObject> {
+    return this.contextHost.getOptions(target.project, target.target, target.configuration);
+  }
+
+  // Unused by builders in this package
+  async scheduleBuilder(
+    builderName: string,
+    options?: json.JsonObject,
+    scheduleOptions?: ScheduleOptions,
+  ): Promise<BuilderRun> {
+    throw new Error('Not Implemented.');
+  }
+
+  async scheduleTarget(
+    target: Target,
+    overrides?: json.JsonObject,
+    scheduleOptions?: ScheduleOptions,
+  ): Promise<BuilderRun> {
+    const { info, handler } = await this.contextHost.findBuilderByTarget(
+      target.project,
+      target.target,
+    );
+    const targetOptions = await this.validateOptions(
+      {
+        ...(await this.getTargetOptions(target)),
+        ...overrides,
+      },
+      info.builderName,
+    );
+
+    const context = new HarnessBuilderContext(
+      info,
+      this.workspaceRoot,
+      this.contextHost,
+      this.watcherFactory,
+    );
+    context.target = target;
+    context.logger = scheduleOptions?.logger || this.logger.createChild('');
+
+    const progressSubject = new Subject<BuilderProgressReport>();
+    const output = convertBuilderOutputToObservable(handler(targetOptions, context));
+
+    const run: BuilderRun = {
+      id: context.id,
+      info,
+      progress: progressSubject.asObservable(),
+      async stop() {
+        for (const teardown of context.teardowns) {
+          await teardown();
+        }
+        progressSubject.complete();
+      },
+      output: output.pipe(shareReplay()),
+      get result() {
+        return this.output.pipe(first()).toPromise();
+      },
+    };
+
+    return run;
+  }
+
+  async validateOptions<T extends json.JsonObject = json.JsonObject>(
+    options: json.JsonObject,
+    builderName: string,
+  ): Promise<T> {
+    return (this.contextHost.validate(options, builderName) as unknown) as T;
+  }
+
+  // Unused report methods
+  reportRunning(): void {}
+  reportStatus(): void {}
+  reportProgress(): void {}
+}
+
+function isAsyncIterable<T>(obj: unknown): obj is AsyncIterable<T> {
+  return !!obj && typeof (obj as AsyncIterable<T>)[Symbol.asyncIterator] === 'function';
+}
+
+function convertBuilderOutputToObservable(output: BuilderOutputLike): Observable<BuilderOutput> {
+  if (isBuilderOutput(output)) {
+    return observableOf(output);
+  } else if (isAsyncIterable(output)) {
+    return fromAsyncIterable(output);
+  } else {
+    return observableFrom(output);
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/testing/builder-harness_spec.ts b/packages/angular_devkit/build_angular/src/testing/builder-harness_spec.ts
new file mode 100644
index 000000000000..ddbc2e195eac
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/testing/builder-harness_spec.ts
@@ -0,0 +1,134 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { BuilderHarness } from './builder-harness';
+
+describe('BuilderHarness', () => {
+  let mockHost: TestProjectHost;
+
+  beforeEach(() => {
+    mockHost = jasmine.createSpyObj('TestProjectHost', ['root']);
+    (mockHost.root as jasmine.Spy).and.returnValue('.');
+  });
+
+  it('uses the provided builder handler', async () => {
+    const mockHandler = jasmine.createSpy().and.returnValue({ success: true });
+
+    const harness = new BuilderHarness(mockHandler, mockHost);
+
+    await harness.executeOnce();
+
+    expect(mockHandler).toHaveBeenCalled();
+  });
+
+  it('provides the builder output result when executing', async () => {
+    const mockHandler = jasmine.createSpy().and.returnValue({ success: false, property: 'value' });
+
+    const harness = new BuilderHarness(mockHandler, mockHost);
+    const { result } = await harness.executeOnce();
+
+    expect(result).toBeDefined();
+    expect(result?.success).toBeFalse();
+    expect(result?.property).toBe('value');
+  });
+
+  it('does not show builder logs on console when a builder succeeds', async () => {
+    const consoleErrorMock = spyOn(console, 'error');
+
+    const harness = new BuilderHarness(async (_, context) => {
+      context.logger.warn('TEST WARNING');
+
+      return { success: true };
+    }, mockHost);
+
+    const { result } = await harness.executeOnce();
+
+    expect(result).toBeDefined();
+    expect(result?.success).toBeTrue();
+
+    expect(consoleErrorMock).not.toHaveBeenCalledWith(jasmine.stringMatching('TEST WARNING'));
+  });
+
+  it('shows builder logs on console when a builder fails', async () => {
+    const consoleErrorMock = spyOn(console, 'error');
+
+    const harness = new BuilderHarness(async (_, context) => {
+      context.logger.warn('TEST WARNING');
+
+      return { success: false };
+    }, mockHost);
+
+    const { result } = await harness.executeOnce();
+
+    expect(result).toBeDefined();
+    expect(result?.success).toBeFalse();
+
+    expect(consoleErrorMock).toHaveBeenCalledWith(jasmine.stringMatching('TEST WARNING'));
+  });
+
+  it('does not show builder logs on console when a builder fails and outputLogsOnFailure: false', async () => {
+    const consoleErrorMock = spyOn(console, 'error');
+
+    const harness = new BuilderHarness(async (_, context) => {
+      context.logger.warn('TEST WARNING');
+
+      return { success: false };
+    }, mockHost);
+
+    const { result } = await harness.executeOnce({ outputLogsOnFailure: false });
+
+    expect(result).toBeDefined();
+    expect(result?.success).toBeFalse();
+
+    expect(consoleErrorMock).not.toHaveBeenCalledWith(jasmine.stringMatching('TEST WARNING'));
+  });
+
+  it('provides and logs the builder output exception when builder throws', async () => {
+    const mockHandler = jasmine.createSpy().and.throwError(new Error('Builder Error'));
+    const consoleErrorMock = spyOn(console, 'error');
+
+    const harness = new BuilderHarness(mockHandler, mockHost);
+    const { result, error } = await harness.executeOnce();
+
+    expect(result).toBeUndefined();
+    expect(error).toEqual(jasmine.objectContaining({ message: 'Builder Error' }));
+    expect(consoleErrorMock).toHaveBeenCalledWith(jasmine.stringMatching('Builder Error'));
+  });
+
+  it('does not log exception with outputLogsOnException false when builder throws', async () => {
+    const mockHandler = jasmine.createSpy().and.throwError(new Error('Builder Error'));
+    const consoleErrorMock = spyOn(console, 'error');
+
+    const harness = new BuilderHarness(mockHandler, mockHost);
+    const { result, error } = await harness.executeOnce({ outputLogsOnException: false });
+
+    expect(result).toBeUndefined();
+    expect(error).toEqual(jasmine.objectContaining({ message: 'Builder Error' }));
+    expect(consoleErrorMock).not.toHaveBeenCalledWith(jasmine.stringMatching('Builder Error'));
+  });
+
+  it('supports executing a target from within a builder', async () => {
+    const mockHandler = jasmine.createSpy().and.returnValue({ success: true });
+
+    const harness = new BuilderHarness(async (_, context) => {
+      const run = await context.scheduleTarget({project: 'test', target: 'another' });
+      expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+      await run.stop();
+
+      return { success: true };
+    }, mockHost);
+    harness.withBuilderTarget('another', mockHandler);
+
+    const { result } = await harness.executeOnce();
+
+    expect(result).toBeDefined();
+    expect(result?.success).toBeTrue();
+
+    expect(mockHandler).toHaveBeenCalled();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/testing/file-watching.ts b/packages/angular_devkit/build_angular/src/testing/file-watching.ts
new file mode 100644
index 000000000000..868ef4769f1c
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/testing/file-watching.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  BuilderWatcherCallback,
+  BuilderWatcherFactory,
+} from '../webpack/plugins/builder-watch-plugin';
+
+class WatcherDescriptor {
+  constructor(
+    readonly files: ReadonlySet<string>,
+    readonly directories: ReadonlySet<string>,
+    readonly callback: BuilderWatcherCallback,
+  ) {}
+
+  shouldNotify(path: string): boolean {
+    return true;
+  }
+}
+
+export class WatcherNotifier implements BuilderWatcherFactory {
+  private readonly descriptors = new Set<WatcherDescriptor>();
+
+  notify(events: Iterable<{ path: string; type: 'modified' | 'deleted' }>): void {
+    for (const descriptor of this.descriptors) {
+      for (const { path } of events) {
+        if (descriptor.shouldNotify(path)) {
+          descriptor.callback([...events]);
+          break;
+        }
+      }
+    }
+  }
+
+  watch(
+    files: Iterable<string>,
+    directories: Iterable<string>,
+    callback: BuilderWatcherCallback,
+  ): { close(): void } {
+    const descriptor = new WatcherDescriptor(new Set(files), new Set(directories), callback);
+    this.descriptors.add(descriptor);
+
+    return { close: () => this.descriptors.delete(descriptor) };
+  }
+}
+
+export { BuilderWatcherFactory };
diff --git a/packages/angular_devkit/build_angular/src/testing/index.ts b/packages/angular_devkit/build_angular/src/testing/index.ts
new file mode 100644
index 000000000000..7887f1feebc1
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/testing/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { BuilderHarnessExecutionOptions, BuilderHarnessExecutionResult } from './builder-harness';
+export { HarnessFileMatchers, describeBuilder } from './jasmine-helpers';
diff --git a/packages/angular_devkit/build_angular/src/testing/jasmine-helpers.ts b/packages/angular_devkit/build_angular/src/testing/jasmine-helpers.ts
new file mode 100644
index 000000000000..d13dfd11c3af
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/testing/jasmine-helpers.ts
@@ -0,0 +1,126 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderHandlerFn } from '@angular-devkit/architect';
+import { json } from '@angular-devkit/core';
+import { readFileSync } from 'fs';
+import { host } from '../test-utils';
+import { BuilderHarness } from './builder-harness';
+
+const optionSchemaCache = new Map<string, json.schema.JsonSchema>();
+
+export function describeBuilder<T>(
+  builderHandler: BuilderHandlerFn<T & json.JsonObject>,
+  options: { name?: string; schemaPath: string },
+  specDefinitions: (harness: JasmineBuilderHarness<T>) => void,
+): void {
+  let optionSchema = optionSchemaCache.get(options.schemaPath);
+  if (optionSchema === undefined) {
+    optionSchema = JSON.parse(readFileSync(options.schemaPath, 'utf8')) as json.schema.JsonSchema;
+    optionSchemaCache.set(options.schemaPath, optionSchema);
+  }
+  const harness = new JasmineBuilderHarness<T>(builderHandler, host, {
+    builderName: options.name,
+    optionSchema,
+  });
+
+  describe(options.name || builderHandler.name, () => {
+    beforeEach(() => host.initialize().toPromise());
+
+    afterEach(() => host.restore().toPromise());
+
+    specDefinitions(harness);
+  });
+}
+
+class JasmineBuilderHarness<T> extends BuilderHarness<T> {
+  expectFile(path: string): HarnessFileMatchers {
+    return expectFile(path, this);
+  }
+}
+
+export interface HarnessFileMatchers {
+  toExist(): boolean;
+  toNotExist(): boolean;
+  readonly content: jasmine.ArrayLikeMatchers<string>;
+  readonly size: jasmine.Matchers<number>;
+}
+
+/**
+ * Add a Jasmine expectation filter to an expectation that always fails with a message.
+ * @param base The base expectation (`expect(...)`) to use.
+ * @param message The message to provide in the expectation failure.
+ */
+function createFailureExpectation<T>(base: T, message: string): T {
+  // Needed typings are not included in the Jasmine types
+  const expectation = base as T & {
+    expector: {
+      addFilter(filter: {
+        selectComparisonFunc(): () => { pass: boolean; message: string };
+      }): typeof expectation.expector;
+    };
+  };
+  expectation.expector = expectation.expector.addFilter({
+    selectComparisonFunc() {
+      return () => ({
+        pass: false,
+        message,
+      });
+    },
+  });
+
+  return expectation;
+}
+
+export function expectFile<T>(path: string, harness: BuilderHarness<T>): HarnessFileMatchers {
+  return {
+    toExist() {
+      const exists = harness.hasFile(path);
+      expect(exists).toBe(true, 'Expected file to exist: ' + path);
+
+      return exists;
+    },
+    toNotExist() {
+      const exists = harness.hasFile(path);
+      expect(exists).toBe(false, 'Expected file to not exist: ' + path);
+
+      return !exists;
+    },
+    get content() {
+      try {
+        return expect(harness.readFile(path)).withContext(`With file content for '${path}'`);
+      } catch (e) {
+        if (e.code !== 'ENOENT') {
+          throw e;
+        }
+
+        // File does not exist so always fail the expectation
+        return createFailureExpectation(
+          expect(''),
+          `Expected file content but file does not exist: '${path}'`,
+        );
+      }
+    },
+    get size() {
+      try {
+        return expect(Buffer.byteLength(harness.readFile(path))).withContext(
+          `With file size for '${path}'`,
+        );
+      } catch (e) {
+        if (e.code !== 'ENOENT') {
+          throw e;
+        }
+
+        // File does not exist so always fail the expectation
+        return createFailureExpectation(
+          expect(0),
+          `Expected file size but file does not exist: '${path}'`,
+        );
+      }
+    },
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/transforms.ts b/packages/angular_devkit/build_angular/src/transforms.ts
index c724aedab646..2e6399ca9acc 100644
--- a/packages/angular_devkit/build_angular/src/transforms.ts
+++ b/packages/angular_devkit/build_angular/src/transforms.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 36e2a5cd96c2..777b97344662 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -28,7 +28,7 @@ async function _run(
 ): Promise<BuilderOutput> {
   context.logger.warn(
     `TSLint's support is discontinued and we're deprecating its support in Angular CLI.\n` +
-    'To opt-in using the community driven ESLint builder, see: https://github.com/angular-eslint/angular-eslint#migrating-from-codelyzer-and-tslint.',
+    'To opt-in using the community driven ESLint builder, see: https://github.com/angular-eslint/angular-eslint#migrating-an-angular-cli-project-from-codelyzer-and-tslint.',
   );
 
   const systemRoot = context.workspaceRoot;
diff --git a/packages/angular_devkit/build_angular/src/tslint/works_spec.ts b/packages/angular_devkit/build_angular/src/tslint/works_spec.ts
index 9b850eb32531..ad0360941bd0 100644
--- a/packages/angular_devkit/build_angular/src/tslint/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/works_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,7 +14,7 @@ import {
   schema,
   workspaces,
 } from '@angular-devkit/core';
-import { NodeJsAsyncHost } from '@angular-devkit/core/node';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { workspaceRoot } from '../test-utils';
 
 
@@ -32,7 +32,7 @@ describe('Tslint Target', () => {
 
     const { workspace } = await workspaces.readWorkspace(
       normalize(workspaceRoot),
-      workspaces.createWorkspaceHost(new NodeJsAsyncHost()),
+      workspaces.createWorkspaceHost(new NodeJsSyncHost()),
     );
 
     testArchitectHost = new TestingArchitectHost(
diff --git a/packages/angular_devkit/build_angular/src/typings.d.ts b/packages/angular_devkit/build_angular/src/typings.d.ts
index 9a5d06cfa771..121268adf4fb 100644
--- a/packages/angular_devkit/build_angular/src/typings.d.ts
+++ b/packages/angular_devkit/build_angular/src/typings.d.ts
@@ -1,22 +1,10 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
-// Alternative approach instead of https://github.com/angular/angular/pull/33226
-declare module '@babel/core' {
-  export * from '@types/babel__core';
-}
-declare module '@babel/generator' {
-  export { default } from '@types/babel__generator';
-}
-declare module '@babel/traverse' {
-  export { default } from '@types/babel__traverse';
-}
-declare module '@babel/template' {
-  export { default } from '@types/babel__template';
+declare module '@discoveryjs/json-ext' {
+  export function stringifyStream(value: unknown): import('stream').Readable;
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/action-cache.ts b/packages/angular_devkit/build_angular/src/utils/action-cache.ts
index 9a2fd8f0a407..f61869b0f506 100644
--- a/packages/angular_devkit/build_angular/src/utils/action-cache.ts
+++ b/packages/angular_devkit/build_angular/src/utils/action-cache.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -33,15 +33,21 @@ export class BundleActionCache {
     }
   }
 
-  generateBaseCacheKey(content: string): string {
-    // Create base cache key with elements:
-    // * package version - different build-angular versions cause different final outputs
-    // * code length/hash - ensure cached version matches the same input code
+  generateIntegrityValue(content: string): string {
     const algorithm = this.integrityAlgorithm || 'sha1';
     const codeHash = createHash(algorithm)
       .update(content)
       .digest('base64');
-    let baseCacheKey = `${packageVersion}|${content.length}|${algorithm}-${codeHash}`;
+
+    return `${algorithm}-${codeHash}`;
+  }
+
+  generateBaseCacheKey(content: string): string {
+    // Create base cache key with elements:
+    // * package version - different build-angular versions cause different final outputs
+    // * code length/hash - ensure cached version matches the same input code
+    const integrity = this.generateIntegrityValue(content);
+    let baseCacheKey = `${packageVersion}|${content.length}|${integrity}`;
     if (!allowMangle) {
       baseCacheKey += '|MD';
     }
@@ -116,7 +122,10 @@ export class BundleActionCache {
       return null;
     }
 
-    const result: ProcessBundleResult = { name: action.name };
+    const result: ProcessBundleResult = {
+      name: action.name,
+      integrity: this.generateIntegrityValue(action.code),
+    };
 
     let cacheEntry = entries[CacheKey.OriginalCode];
     if (cacheEntry) {
diff --git a/packages/angular_devkit/build_angular/src/utils/action-executor.ts b/packages/angular_devkit/build_angular/src/utils/action-executor.ts
index a57d59e28d20..921b3edd39a5 100644
--- a/packages/angular_devkit/build_angular/src/utils/action-executor.ts
+++ b/packages/angular_devkit/build_angular/src/utils/action-executor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 29abf699a050..f1b783b2b258 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index 17ef63fde0e3..09c9603a46d7 100644
--- 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/build-options.ts b/packages/angular_devkit/build_angular/src/utils/build-options.ts
index 70954cb64af2..540d1b1546e3 100644
--- a/packages/angular_devkit/build_angular/src/utils/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/utils/build-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,14 +14,16 @@ import {
   CrossOrigin,
   ExtraEntryPoint,
   I18NMissingTranslation,
+  IndexUnion,
   Localize,
-  OptimizationClass,
   SourceMapClass,
 } from '../browser/schema';
+import { Schema as DevServerSchema } from '../dev-server/schema';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
+import { NormalizedOptimizationOptions } from './normalize-optimization';
 
 export interface BuildOptions {
-  optimization: OptimizationClass;
+  optimization: NormalizedOptimizationOptions;
   environment?: string;
   outputPath: string;
   resourcesOutputPath?: string;
@@ -48,6 +50,7 @@ export interface BuildOptions {
   watch?: boolean;
   outputHashing?: string;
   poll?: number;
+  index?: IndexUnion;
   deleteOutputPath?: boolean;
   preserveSymlinks?: boolean;
   extractLicenses?: boolean;
@@ -61,7 +64,6 @@ export interface BuildOptions {
   statsJson: boolean;
   forkTypeChecker: boolean;
   hmr?: boolean;
-
   main: string;
   polyfills?: string;
   budgets: Budget[];
@@ -73,13 +75,11 @@ export interface BuildOptions {
   lazyModules: string[];
   platform?: 'browser' | 'server';
   fileReplacements: NormalizedFileReplacement[];
-  /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
-  rebaseRootRelativeCssUrls?: boolean;
 
   experimentalRollupPass?: boolean;
   allowedCommonJsDependencies?: string[];
 
-  differentialLoadingMode?: boolean;
+  differentialLoadingNeeded?: boolean;
 }
 
 export interface WebpackTestOptions extends BuildOptions {
@@ -87,6 +87,8 @@ export interface WebpackTestOptions extends BuildOptions {
   codeCoverageExclude?: string[];
 }
 
+export interface WebpackDevServerOptions extends BuildOptions, Omit<DevServerSchema, 'optimization' | 'sourceMap' | 'browserTarget'> { }
+
 export interface WebpackConfigOptions<T = BuildOptions> {
   root: string;
   logger: logging.Logger;
@@ -95,5 +97,5 @@ export interface WebpackConfigOptions<T = BuildOptions> {
   buildOptions: T;
   tsConfig: ParsedConfiguration;
   tsConfigPath: string;
-  supportES2015: boolean;
+  scriptTarget: import('typescript').ScriptTarget;
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts
index 8f27e1986115..b1e9650e8901 100644
--- a/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts
@@ -1,10 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from 'path';
 import * as webpack from 'webpack';
 import { Budget, Type } from '../browser/schema';
 import { ProcessBundleFile, ProcessBundleResult } from '../utils/process-bundle';
@@ -32,9 +33,8 @@ export enum ThresholdSeverity {
 }
 
 enum DifferentialBuildType {
-  // FIXME: this should match the actual file suffix and not hardcoded.
-  ORIGINAL = 'es2015',
-  DOWNLEVEL = 'es5',
+  ORIGINAL = 'original',
+  DOWNLEVEL = 'downlevel',
 }
 
 export function* calculateThresholds(budget: Budget): IterableIterator<Threshold> {
@@ -181,6 +181,18 @@ abstract class Calculator {
           .reduce((l, r) => l + r, 0);
     }
   }
+
+  protected getAssetSize(asset: Asset): number {
+    if (asset.name.endsWith('.js')) {
+      const processResult = this.processResults
+        .find((processResult) => processResult.original && basename(processResult.original.filename) === asset.name);
+      if (processResult?.original) {
+        return processResult.original.size;
+      }
+    }
+
+    return asset.size;
+  }
 }
 
 /**
@@ -193,15 +205,17 @@ class BundleCalculator extends Calculator {
       return [];
     }
 
+    const buildTypeLabels = getBuildTypeLabels(this.processResults);
+
     // The chunk may or may not have differential builds. Compute the size for
     // each then check afterwards if they are all the same.
     const buildSizes = Object.values(DifferentialBuildType).map((buildType) => {
       const size = this.chunks
-          .filter(chunk => chunk.names.indexOf(budgetName) !== -1)
-          .map(chunk => this.calculateChunkSize(chunk, buildType))
-          .reduce((l, r) => l + r, 0);
+        .filter(chunk => chunk.names.includes(budgetName))
+        .map(chunk => this.calculateChunkSize(chunk, buildType))
+        .reduce((l, r) => l + r, 0);
 
-      return {size, label: `bundle ${this.budget.name}-${buildType}`};
+      return { size, label: `bundle ${this.budget.name}-${buildTypeLabels[buildType]}` };
     });
 
     // If this bundle was not actually generated by a differential build, then
@@ -219,13 +233,14 @@ class BundleCalculator extends Calculator {
  */
 class InitialCalculator extends Calculator {
   calculate() {
+    const buildTypeLabels = getBuildTypeLabels(this.processResults);
     const buildSizes = Object.values(DifferentialBuildType).map((buildType) => {
       return {
-        label: `bundle initial-${buildType}`,
+        label: `bundle initial-${buildTypeLabels[buildType]}`,
         size: this.chunks
-            .filter(chunk => chunk.initial)
-            .map(chunk => this.calculateChunkSize(chunk, buildType))
-            .reduce((l, r) => l + r, 0),
+          .filter(chunk => chunk.initial)
+          .map(chunk => this.calculateChunkSize(chunk, buildType))
+          .reduce((l, r) => l + r, 0),
       };
     });
 
@@ -246,7 +261,7 @@ class AllScriptCalculator extends Calculator {
   calculate() {
     const size = this.assets
       .filter(asset => asset.name.endsWith('.js'))
-      .map(asset => asset.size)
+      .map(asset => this.getAssetSize(asset))
       .reduce((total: number, size: number) => total + size, 0);
 
     return [{size, label: 'total scripts'}];
@@ -260,7 +275,7 @@ class AllCalculator extends Calculator {
   calculate() {
     const size = this.assets
       .filter(asset => !asset.name.endsWith('.map'))
-      .map(asset => asset.size)
+      .map(asset => this.getAssetSize(asset))
       .reduce((total: number, size: number) => total + size, 0);
 
     return [{size, label: 'total'}];
@@ -275,7 +290,7 @@ class AnyScriptCalculator extends Calculator {
     return this.assets
       .filter(asset => asset.name.endsWith('.js'))
       .map(asset => ({
-        size: asset.size,
+        size: this.getAssetSize(asset),
         label: asset.name,
       }));
   }
@@ -289,7 +304,7 @@ class AnyCalculator extends Calculator {
     return this.assets
       .filter(asset => !asset.name.endsWith('.map'))
       .map(asset => ({
-        size: asset.size,
+        size: this.getAssetSize(asset),
         label: asset.name,
       }));
   }
@@ -419,3 +434,19 @@ function mergeDifferentialBuildSizes(buildSizes: Size[], mergeLabel: string): Si
 function allEquivalent<T>(items: Iterable<T>): boolean {
   return new Set(items).size < 2;
 }
+
+function getBuildTypeLabels(processResults: ProcessBundleResult[]): Record<DifferentialBuildType, string> {
+  const fileNameSuffixRegExp = /\-(es20\d{2}|esnext)\./;
+  const originalFileName = processResults
+    .find(({ original }) => original?.filename && fileNameSuffixRegExp.test(original.filename))?.original?.filename;
+
+  let originalSuffix: string | undefined;
+  if (originalFileName) {
+    originalSuffix = fileNameSuffixRegExp.exec(originalFileName)?.[1];
+  }
+
+  return {
+    [DifferentialBuildType.DOWNLEVEL]: 'es5',
+    [DifferentialBuildType.ORIGINAL]: originalSuffix || 'es2015',
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/bundle-calculator_spec.ts b/packages/angular_devkit/build_angular/src/utils/bundle-calculator_spec.ts
index da599f2d3a6a..d0cbe3daa5ba 100644
--- a/packages/angular_devkit/build_angular/src/utils/bundle-calculator_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/bundle-calculator_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -240,7 +240,7 @@ describe('bundle-calculator', () => {
           name: '0',
           // Individual builds are under budget, but combined they are over.
           original: {
-            filename: 'initial-es2015.js',
+            filename: 'initial-es2017.js',
             size: 1.25 * KB,
           },
           downlevel: {
@@ -255,7 +255,7 @@ describe('bundle-calculator', () => {
       expect(failures.length).toBe(2);
       expect(failures).toContain({
         severity: ThresholdSeverity.Error,
-        message: jasmine.stringMatching('bundle initial-es2015 exceeded maximum budget.'),
+        message: jasmine.stringMatching('bundle initial-es2017 exceeded maximum budget.'),
       });
       expect(failures).toContain({
         severity: ThresholdSeverity.Error,
@@ -464,5 +464,169 @@ describe('bundle-calculator', () => {
         message: jasmine.stringMatching('foo.ext exceeded maximum budget.'),
       });
     });
+
+    it('does *not* yield a combined differential bundle budget for any script', () => {
+      const budgets: Budget[] = [{
+        type: Type.AnyScript,
+        maximumError: '1kb',
+      }];
+      const stats = {
+        chunks: [
+          {
+            initial: true,
+            files: [ 'foo.js' ],
+          },
+        ],
+        assets: [
+          {
+            name: 'main-es2015.js',
+            size: 1.25 * KB,
+          },
+        ],
+      } as unknown as webpack.Stats.ToJsonOutput;
+      const processResults: ProcessBundleResult[] = [
+        {
+          name: '0',
+          // Individual builds are under budget, but combined they are over.
+          original: {
+            filename: '/home/main-es2015.js',
+            size: 0.5 * KB,
+          },
+          downlevel: {
+            filename: '/home/main-es5.js',
+            size: 0.75 * KB,
+          },
+        },
+      ];
+
+      const failures = Array.from(checkBudgets(budgets, stats, processResults));
+
+      // Because individual builds are under budget, they are acceptable. Should
+      // **not** yield a combined build which is over budget.
+      expect(failures.length).toBe(0);
+    });
+
+    it('does *not* yield a combined differential bundle budget for all script', () => {
+      const budgets: Budget[] = [{
+        type: Type.AllScript,
+        maximumError: '1kb',
+      }];
+      const stats = {
+        chunks: [
+          {
+            initial: true,
+            files: [ 'foo.js' ],
+          },
+        ],
+        assets: [
+          {
+            name: 'main-es2015.js',
+            size: 1.25 * KB,
+          },
+        ],
+      } as unknown as webpack.Stats.ToJsonOutput;
+      const processResults: ProcessBundleResult[] = [
+        {
+          name: '0',
+          // Individual builds are under budget, but combined they are over.
+          original: {
+            filename: '/home/main-es2015.js',
+            size: 0.5 * KB,
+          },
+          downlevel: {
+            filename: '/home/main-es5.js',
+            size: 0.75 * KB,
+          },
+        },
+      ];
+
+      const failures = Array.from(checkBudgets(budgets, stats, processResults));
+
+      // Because individual builds are under budget, they are acceptable. Should
+      // **not** yield a combined build which is over budget.
+      expect(failures.length).toBe(0);
+    });
+
+    it('does *not* yield a combined differential bundle budget for total budget', () => {
+      const budgets: Budget[] = [{
+        type: Type.All,
+        maximumError: '1kb',
+      }];
+      const stats = {
+        chunks: [
+          {
+            initial: true,
+            files: [ 'foo.js' ],
+          },
+        ],
+        assets: [
+          {
+            name: 'main-es2015.js',
+            size: 1.25 * KB,
+          },
+        ],
+      } as unknown as webpack.Stats.ToJsonOutput;
+      const processResults: ProcessBundleResult[] = [
+        {
+          name: '0',
+          // Individual builds are under budget, but combined they are over.
+          original: {
+            filename: '/home/main-es2015.js',
+            size: 0.5 * KB,
+          },
+          downlevel: {
+            filename: '/home/main-es5.js',
+            size: 0.75 * KB,
+          },
+        },
+      ];
+
+      const failures = Array.from(checkBudgets(budgets, stats, processResults));
+
+      // Because individual builds are under budget, they are acceptable. Should
+      // **not** yield a combined build which is over budget.
+      expect(failures.length).toBe(0);
+    });
+
+    it('does *not* yield a combined differential bundle budget for individual file budget', () => {
+      const budgets: Budget[] = [{
+        type: Type.Any,
+        maximumError: '1kb',
+      }];
+      const stats = {
+        chunks: [
+          {
+            initial: true,
+            files: [ 'foo.js' ],
+          },
+        ],
+        assets: [
+          {
+            name: 'main-es2015.js',
+            size: 1.25 * KB,
+          },
+        ],
+      } as unknown as webpack.Stats.ToJsonOutput;
+      const processResults: ProcessBundleResult[] = [
+        {
+          name: '0',
+          // Individual builds are under budget, but combined they are over.
+          original: {
+            filename: '/home/main-es2015.js',
+            size: 0.5 * KB,
+          },
+          downlevel: {
+            filename: '/home/main-es5.js',
+            size: 0.75 * KB,
+          },
+        },
+      ];
+
+      const failures = Array.from(checkBudgets(budgets, stats, processResults));
+
+      // Because individual builds are under budget, they are acceptable. Should
+      // **not** yield a combined build which is over budget.
+      expect(failures.length).toBe(0);
+    });
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/utils/cache-path.ts b/packages/angular_devkit/build_angular/src/utils/cache-path.ts
index a6eeffdd7495..a1a9180b7242 100644
--- a/packages/angular_devkit/build_angular/src/utils/cache-path.ts
+++ b/packages/angular_devkit/build_angular/src/utils/cache-path.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/check-port.ts b/packages/angular_devkit/build_angular/src/utils/check-port.ts
index 1a21cfa61fb0..4048cc5866d2 100644
--- a/packages/angular_devkit/build_angular/src/utils/check-port.ts
+++ b/packages/angular_devkit/build_angular/src/utils/check-port.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/color.ts b/packages/angular_devkit/build_angular/src/utils/color.ts
index 6e7d11cb7fe2..c729fa6a5811 100644
--- a/packages/angular_devkit/build_angular/src/utils/color.ts
+++ b/packages/angular_devkit/build_angular/src/utils/color.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/copy-assets.ts b/packages/angular_devkit/build_angular/src/utils/copy-assets.ts
index 17e2fdd64c20..d69a4c6e074a 100644
--- a/packages/angular_devkit/build_angular/src/utils/copy-assets.ts
+++ b/packages/angular_devkit/build_angular/src/utils/copy-assets.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -17,7 +17,14 @@ function globAsync(pattern: string, options: glob.IOptions) {
 }
 
 export async function copyAssets(
-  entries: { glob: string; ignore?: string[]; input: string; output: string; flatten?: boolean }[],
+  entries: {
+    glob: string;
+    ignore?: string[];
+    input: string;
+    output: string;
+    flatten?: boolean;
+    followSymlinks?: boolean;
+  }[],
   basePaths: Iterable<string>,
   root: string,
   changed?: Set<string>,
@@ -31,6 +38,7 @@ export async function copyAssets(
       dot: true,
       nodir: true,
       ignore: entry.ignore ? defaultIgnore.concat(entry.ignore) : defaultIgnore,
+      follow: entry.followSymlinks,
     });
 
     const directoryExists = new Set<string>();
diff --git a/packages/angular_devkit/build_angular/src/utils/copy-file.ts b/packages/angular_devkit/build_angular/src/utils/copy-file.ts
index f935599fe95f..252f9475990b 100644
--- a/packages/angular_devkit/build_angular/src/utils/copy-file.ts
+++ b/packages/angular_devkit/build_angular/src/utils/copy-file.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/default-progress.ts b/packages/angular_devkit/build_angular/src/utils/default-progress.ts
index 258412b460f1..ce78668341a0 100644
--- a/packages/angular_devkit/build_angular/src/utils/default-progress.ts
+++ b/packages/angular_devkit/build_angular/src/utils/default-progress.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index bb8c648a1220..534e1e9a3229 100644
--- a/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts
+++ b/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/environment-options.ts b/packages/angular_devkit/build_angular/src/utils/environment-options.ts
index 2d896edb9389..ff57506f3f9d 100644
--- a/packages/angular_devkit/build_angular/src/utils/environment-options.ts
+++ b/packages/angular_devkit/build_angular/src/utils/environment-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -82,3 +82,8 @@ export const cachingBasePath = (() => {
 // Build profiling
 const profilingVariable = process.env['NG_BUILD_PROFILING'];
 export const profilingEnabled = isPresent(profilingVariable) && isEnabled(profilingVariable);
+
+// Legacy Webpack plugin with Ivy
+const legacyIvyVariable = process.env['NG_BUILD_IVY_LEGACY'];
+export const legacyIvyPluginEnabled =
+  isPresent(legacyIvyVariable) && !isDisabled(legacyIvyVariable);
diff --git a/packages/angular_devkit/build_angular/src/utils/find-up.ts b/packages/angular_devkit/build_angular/src/utils/find-up.ts
index e499326b8822..7f5266f277f5 100644
--- a/packages/angular_devkit/build_angular/src/utils/find-up.ts
+++ b/packages/angular_devkit/build_angular/src/utils/find-up.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,34 +9,6 @@ import { existsSync } from 'fs';
 import * as path from 'path';
 import { isDirectory } from './is-directory';
 
-export function findUp(names: string | string[], from: string, stopOnNodeModules = false): string | null {
-  if (!Array.isArray(names)) {
-    names = [names];
-  }
-  const root = path.parse(from).root;
-
-  let currentDir = from;
-  while (currentDir && currentDir !== root) {
-    for (const name of names) {
-      const p = path.join(currentDir, name);
-      if (existsSync(p)) {
-        return p;
-      }
-    }
-
-    if (stopOnNodeModules) {
-      const nodeModuleP = path.join(currentDir, 'node_modules');
-      if (existsSync(nodeModuleP)) {
-        return null;
-      }
-    }
-
-    currentDir = path.dirname(currentDir);
-  }
-
-  return null;
-}
-
 export function findAllNodeModules(from: string, root?: string): string[] {
   const nodeModules: string[] = [];
 
diff --git a/packages/angular_devkit/build_angular/src/utils/fs.ts b/packages/angular_devkit/build_angular/src/utils/fs.ts
new file mode 100644
index 000000000000..66240a1a0e99
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/fs.ts
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { promisify } from 'util';
+
+export const mkdir = promisify(fs.mkdir);
+export const readFile = promisify(fs.readFile);
+export const writeFile = promisify(fs.writeFile);
diff --git a/packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts b/packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts
index 66a905c1ef95..ae60ad21c663 100644
--- a/packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts
+++ b/packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,13 +8,12 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { EmittedFiles } from '@angular-devkit/build-webpack';
 import * as fs from 'fs';
-import * as ora from 'ora';
 import * as path from 'path';
 import { BundleActionExecutor } from './action-executor';
-import { colors } from './color';
 import { copyAssets } from './copy-assets';
 import { I18nOptions } from './i18n-options';
 import { InlineOptions } from './process-bundle';
+import { Spinner } from './spinner';
 
 function emittedFilesToInlineOptions(
   emittedFiles: EmittedFiles[],
@@ -75,7 +74,8 @@ export async function i18nInlineEmittedFiles(
 ): Promise<boolean> {
   const executor = new BundleActionExecutor({ i18n });
   let hasErrors = false;
-  const spinner = ora('Generating localized bundles...').start();
+  const spinner = new Spinner();
+  spinner.start('Generating localized bundles...');
 
   try {
     const { options, originalFiles: processedFiles } = emittedFilesToInlineOptions(
@@ -114,7 +114,7 @@ export async function i18nInlineEmittedFiles(
       '',
     );
   } catch (err) {
-    spinner.fail(colors.redBright('Localized bundle generation failed: ' + err.message));
+    spinner.fail('Localized bundle generation failed: ' + err.message);
 
     return false;
   } finally {
@@ -122,7 +122,7 @@ export async function i18nInlineEmittedFiles(
   }
 
   if (hasErrors) {
-    spinner.fail(colors.redBright('Localized bundle generation failed.'));
+    spinner.fail('Localized bundle generation failed.');
   } else {
     spinner.succeed('Localized bundle generation complete.');
   }
diff --git a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts b/packages/angular_devkit/build_angular/src/utils/i18n-options.ts
index 870b01179973..e21bc2553788 100644
--- a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts
+++ b/packages/angular_devkit/build_angular/src/utils/i18n-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -31,6 +31,7 @@ export interface I18nOptions {
   flatOutput?: boolean;
   readonly shouldInline: boolean;
   veCompatLocale?: string;
+  hasDefinedSourceLocale?: boolean;
 }
 
 function normalizeTranslationFileOption(
@@ -93,6 +94,7 @@ export function createI18nOptions(
     }
 
     i18n.sourceLocale = rawSourceLocale;
+    i18n.hasDefinedSourceLocale = true;
   }
 
   i18n.locales[i18n.sourceLocale] = {
@@ -202,91 +204,98 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
     buildOptions.i18nLocale = undefined;
   }
 
-  if (i18n.inlineLocales.size > 0) {
-    const projectRoot = path.join(context.workspaceRoot, (metadata.root as string) || '');
-    const localeDataBasePath = findLocaleDataBasePath(projectRoot);
-    if (!localeDataBasePath) {
-      throw new Error(
-        `Unable to find locale data within '@angular/common'. Please ensure '@angular/common' is installed.`,
-      );
+  // No additional processing needed if no inlining requested and no source locale defined.
+  if (!i18n.shouldInline && !i18n.hasDefinedSourceLocale) {
+    return { buildOptions, i18n };
+  }
+
+  const projectRoot = path.join(context.workspaceRoot, (metadata.root as string) || '');
+  const localeDataBasePath = findLocaleDataBasePath(projectRoot);
+  if (!localeDataBasePath) {
+    throw new Error(
+      `Unable to find locale data within '@angular/common'. Please ensure '@angular/common' is installed.`,
+    );
+  }
+
+  // Load locale data and translations (if present)
+  let loader;
+  const usedFormats = new Set<string>();
+  for (const [locale, desc] of Object.entries(i18n.locales)) {
+    if (!i18n.inlineLocales.has(locale) && locale !== i18n.sourceLocale) {
+      continue;
     }
 
-    // Load locales
-    const loader = await createTranslationLoader();
-    const usedFormats = new Set<string>();
-    for (const [locale, desc] of Object.entries(i18n.locales)) {
-      if (!i18n.inlineLocales.has(locale)) {
-        continue;
+    let localeDataPath = findLocaleDataPath(locale, localeDataBasePath);
+    if (!localeDataPath) {
+      const [first] = locale.split('-');
+      if (first) {
+        localeDataPath = findLocaleDataPath(first.toLowerCase(), localeDataBasePath);
+        if (localeDataPath) {
+          context.logger.warn(
+            `Locale data for '${locale}' cannot be found.  Using locale data for '${first}'.`,
+          );
+        }
       }
+    }
+    if (!localeDataPath) {
+      context.logger.warn(
+        `Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`,
+      );
+    } else {
+      desc.dataPath = localeDataPath;
+    }
 
-      let localeDataPath = findLocaleDataPath(locale, localeDataBasePath);
-      if (!localeDataPath) {
-        const [first] = locale.split('-');
-        if (first) {
-          localeDataPath = findLocaleDataPath(first.toLowerCase(), localeDataBasePath);
-          if (localeDataPath) {
-            context.logger.warn(
-              `Locale data for '${locale}' cannot be found.  Using locale data for '${first}'.`,
-            );
-          }
+    if (!desc.files.length) {
+      continue;
+    }
+
+    if (!loader) {
+      loader = await createTranslationLoader();
+    }
+
+    for (const file of desc.files) {
+      const loadResult = loader(path.join(context.workspaceRoot, file.path));
+
+      for (const diagnostics of loadResult.diagnostics.messages) {
+        if (diagnostics.type === 'error') {
+          throw new Error(
+            `Error parsing translation file '${file.path}': ${diagnostics.message}`,
+          );
+        } else {
+          context.logger.warn(`WARNING [${file.path}]: ${diagnostics.message}`);
         }
       }
-      if (!localeDataPath) {
+
+      if (loadResult.locale !== undefined && loadResult.locale !== locale) {
         context.logger.warn(
-          `Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`,
+          `WARNING [${file.path}]: File target locale ('${loadResult.locale}') does not match configured locale ('${locale}')`,
         );
-      } else {
-        desc.dataPath = localeDataPath;
       }
 
-      if (!desc.files.length) {
-        continue;
+      usedFormats.add(loadResult.format);
+      if (usedFormats.size > 1 && tsConfig.options.enableI18nLegacyMessageIdFormat !== false) {
+        // This limitation is only for legacy message id support (defaults to true as of 9.0)
+        throw new Error(
+          'Localization currently only supports using one type of translation file format for the entire application.',
+        );
       }
 
-      for (const file of desc.files) {
-        const loadResult = loader(path.join(context.workspaceRoot, file.path));
+      file.format = loadResult.format;
+      file.integrity = loadResult.integrity;
 
-        for (const diagnostics of loadResult.diagnostics.messages) {
-          if (diagnostics.type === 'error') {
-            throw new Error(
-              `Error parsing translation file '${file.path}': ${diagnostics.message}`,
+      if (desc.translation) {
+        // Merge translations
+        for (const [id, message] of Object.entries(loadResult.translations)) {
+          if (desc.translation[id] !== undefined) {
+            context.logger.warn(
+              `WARNING [${file.path}]: Duplicate translations for message '${id}' when merging`,
             );
-          } else {
-            context.logger.warn(`WARNING [${file.path}]: ${diagnostics.message}`);
           }
+          desc.translation[id] = message;
         }
-
-        if (loadResult.locale !== undefined && loadResult.locale !== locale) {
-          context.logger.warn(
-            `WARNING [${file.path}]: File target locale ('${loadResult.locale}') does not match configured locale ('${locale}')`,
-          );
-        }
-
-        usedFormats.add(loadResult.format);
-        if (usedFormats.size > 1 && tsConfig.options.enableI18nLegacyMessageIdFormat !== false) {
-          // This limitation is only for legacy message id support (defaults to true as of 9.0)
-          throw new Error(
-            'Localization currently only supports using one type of translation file format for the entire application.',
-          );
-        }
-
-        file.format = loadResult.format;
-        file.integrity = loadResult.integrity;
-
-        if (desc.translation) {
-          // Merge translations
-          for (const [id, message] of Object.entries(loadResult.translations)) {
-            if (desc.translation[id] !== undefined) {
-              context.logger.warn(
-                `WARNING [${file.path}]: Duplicate translations for message '${id}' when merging`,
-              );
-            }
-            desc.translation[id] = message;
-          }
-        } else {
-          // First or only translation file
-          desc.translation = loadResult.translations;
-        }
+      } else {
+        // First or only translation file
+        desc.translation = loadResult.translations;
       }
     }
 
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts
index 26b3ca7b42c1..1799d261b338 100644
--- a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,10 +14,8 @@ 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;
   /* Input contents */
-  inputContent: string;
+  html: string;
   baseHref?: string;
   deployUrl?: string;
   sri: boolean;
@@ -59,7 +57,7 @@ export interface FileInfo {
 export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<string> {
   const {
     loadOutputFile, files, noModuleFiles = [], moduleFiles = [], entrypoints,
-    sri, deployUrl = '', lang, baseHref, inputContent,
+    sri, deployUrl = '', lang, baseHref, html,
   } = params;
 
   let { crossOrigin = 'none' } = params;
@@ -89,7 +87,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     }
   }
 
-  const scriptTags: string[] = [];
+  let scriptTags: string[] = [];
   for (const script of scripts) {
     const attrs = [`src="${deployUrl}${script}"`];
 
@@ -126,7 +124,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     scriptTags.push(`<script ${attrs.join(' ')}></script>`);
   }
 
-  const linkTags: string[] = [];
+  let linkTags: string[] = [];
   for (const stylesheet of stylesheets) {
     const attrs = [
       `rel="stylesheet"`,
@@ -145,8 +143,8 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     linkTags.push(`<link ${attrs.join(' ')}>`);
   }
 
-  const { rewriter, transformedContent } = await htmlRewritingStream(inputContent);
-  const baseTagExists = inputContent.includes('<base');
+  const { rewriter, transformedContent } = await htmlRewritingStream(html);
+  const baseTagExists = html.includes('<base');
 
   rewriter
     .on('startTag', tag => {
@@ -182,19 +180,30 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
           for (const linkTag of linkTags) {
             rewriter.emitRaw(linkTag);
           }
+
+          linkTags = [];
           break;
         case 'body':
           // Add script tags
           for (const scriptTag of scriptTags) {
             rewriter.emitRaw(scriptTag);
           }
+
+          scriptTags = [];
           break;
       }
 
       rewriter.emitEndTag(tag);
     });
 
-  return transformedContent;
+  const content = await transformedContent;
+
+  if (linkTags.length || scriptTags.length) {
+    // In case no body/head tags are not present (dotnet partial templates)
+    return linkTags.join('') + scriptTags.join('') + content;
+  }
+
+  return content;
 }
 
 function generateSriAttributes(content: string): string {
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts
index f210c74ae951..3baed5fb5b26 100644
--- a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,8 +10,7 @@ import { AugmentIndexHtmlOptions, FileInfo, augmentIndexHtml } from './augment-i
 
 describe('augment-index-html', () => {
   const indexGeneratorOptions: AugmentIndexHtmlOptions = {
-    input: 'index.html',
-    inputContent: '<html><head></head><body></body></html>',
+    html: '<html><head></head><body></body></html>',
     baseHref: '/',
     sri: false,
     files: [],
@@ -52,7 +51,7 @@ describe('augment-index-html', () => {
   it('should replace base href value', async () => {
     const source = augmentIndexHtml({
       ...indexGeneratorOptions,
-      inputContent: '<html><head><base href="/"></head><body></body></html>',
+      html: '<html><head><base href="/"></head><body></body></html>',
       baseHref: '/Apps/',
     });
 
@@ -167,4 +166,27 @@ describe('augment-index-html', () => {
         </html>
       `);
   });
+
+  it(`should add script and link tags even when body and head element doesn't exist`, async () => {
+    const source = augmentIndexHtml({
+      ...indexGeneratorOptions,
+      html: `<app-root></app-root>`,
+      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;
+    expect(html).toEqual(oneLineHtml`
+      <link rel="stylesheet" href="styles.css">
+      <script src="runtime.js" defer></script>
+      <script src="polyfills.js" defer></script>
+      <script src="main.js" defer></script>
+      <app-root></app-root>
+    `);
+  });
 });
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/html-rewriting-stream.ts b/packages/angular_devkit/build_angular/src/utils/index-file/html-rewriting-stream.ts
index 8cdf857d5cef..d012563a9e34 100644
--- a/packages/angular_devkit/build_angular/src/utils/index-file/html-rewriting-stream.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/html-rewriting-stream.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/index-html-generator.ts b/packages/angular_devkit/build_angular/src/utils/index-file/index-html-generator.ts
new file mode 100644
index 000000000000..1a8a1600f008
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/index-html-generator.ts
@@ -0,0 +1,161 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { readFile } from '../fs';
+import { NormalizedOptimizationOptions } from '../normalize-optimization';
+import { stripBom } from '../strip-bom';
+import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-html';
+import { InlineCriticalCssProcessor } from './inline-critical-css';
+import { InlineFontsProcessor } from './inline-fonts';
+
+type IndexHtmlGeneratorPlugin = (html: string, options: IndexHtmlGeneratorProcessOptions) => Promise<string | IndexHtmlTransformResult>;
+
+export interface IndexHtmlGeneratorProcessOptions {
+  lang: string | undefined;
+  baseHref: string | undefined;
+  outputPath: string;
+  files: FileInfo[];
+  noModuleFiles: FileInfo[];
+  moduleFiles: FileInfo[];
+}
+
+export interface IndexHtmlGeneratorOptions {
+  indexPath: string;
+  deployUrl?: string;
+  sri?: boolean;
+  entrypoints: string[];
+  postTransform?: IndexHtmlTransform;
+  crossOrigin?: CrossOriginValue;
+  optimization?: NormalizedOptimizationOptions;
+  WOFFSupportNeeded: boolean;
+}
+
+export type IndexHtmlTransform = (content: string) => Promise<string>;
+
+export interface IndexHtmlTransformResult {
+  content: string;
+  warnings: string[];
+  errors: string[];
+}
+
+export class IndexHtmlGenerator {
+  private readonly plugins: IndexHtmlGeneratorPlugin[];
+
+  constructor(readonly options: IndexHtmlGeneratorOptions) {
+    const extraPlugins: IndexHtmlGeneratorPlugin[] = [];
+    if (this.options.optimization?.fonts.inline) {
+      extraPlugins.push(inlineFontsPlugin(this));
+    }
+
+    if (this.options.optimization?.styles.inlineCritical) {
+      extraPlugins.push(inlineCriticalCssPlugin(this));
+    }
+
+    this.plugins = [
+      augmentIndexHtmlPlugin(this),
+      ...extraPlugins,
+      postTransformPlugin(this),
+    ];
+  }
+
+  async process(options: IndexHtmlGeneratorProcessOptions): Promise<IndexHtmlTransformResult> {
+    let content = stripBom(await this.readIndex(this.options.indexPath));
+    const warnings: string[] = [];
+    const errors: string[] = [];
+
+    for (const plugin of this.plugins) {
+      const result = await plugin(content, options);
+      if (typeof result === 'string') {
+        content = result;
+      } else {
+        content = result.content;
+
+        if (result.warnings.length) {
+          warnings.push(...result.warnings);
+        }
+
+        if (result.errors.length) {
+          errors.push(...result.errors);
+        }
+      }
+    }
+
+    return {
+      content,
+      warnings,
+      errors,
+    };
+  }
+
+  async readAsset(path: string): Promise<string> {
+    return readFile(path, 'utf-8');
+  }
+
+  protected async readIndex(path: string): Promise<string> {
+    return readFile(path, 'utf-8');
+  }
+}
+
+function augmentIndexHtmlPlugin(generator: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
+  const {
+    deployUrl,
+    crossOrigin,
+    sri = false,
+    entrypoints,
+  } = generator.options;
+
+  return async (html, options) => {
+    const {
+      lang,
+      baseHref,
+      outputPath = '',
+      noModuleFiles,
+      files,
+      moduleFiles,
+    } = options;
+
+    return augmentIndexHtml({
+      html,
+      baseHref,
+      deployUrl,
+      crossOrigin,
+      sri,
+      lang,
+      entrypoints,
+      loadOutputFile: filePath => generator.readAsset(join(outputPath, filePath)),
+      noModuleFiles,
+      moduleFiles,
+      files,
+    });
+  };
+}
+
+function inlineFontsPlugin({ options }: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
+  const inlineFontsProcessor = new InlineFontsProcessor({
+    minify: options.optimization?.styles.minify,
+    WOFFSupportNeeded: options.WOFFSupportNeeded,
+  });
+
+  return async html => inlineFontsProcessor.process(html);
+}
+
+
+function inlineCriticalCssPlugin(generator: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
+  const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
+    minify: generator.options.optimization?.styles.minify,
+    deployUrl: generator.options.deployUrl,
+    readAsset: filePath => generator.readAsset(filePath),
+  });
+
+  return async (html, options) => inlineCriticalCssProcessor.process(html, { outputPath: options.outputPath });
+}
+
+function postTransformPlugin({ options }: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
+  return async html => options.postTransform ? options.postTransform(html) : html;
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts
new file mode 100644
index 000000000000..b93be164e775
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 } from '../fs';
+
+const Critters: typeof import('critters').default = require('critters');
+
+export interface InlineCriticalCssProcessOptions {
+  outputPath: string;
+}
+
+export interface InlineCriticalCssProcessorOptions {
+  minify?: boolean;
+  deployUrl?: string;
+  readAsset?: (path: string) => Promise<string>;
+}
+class CrittersExtended extends Critters {
+  readonly warnings: string[] = [];
+  readonly errors: string[] = [];
+
+  constructor(
+    private readonly optionsExtended: InlineCriticalCssProcessorOptions &
+      InlineCriticalCssProcessOptions,
+  ) {
+    super({
+      logger: {
+        warn: (s: string) => this.warnings.push(s),
+        error: (s: string) => this.errors.push(s),
+        log: () => {},
+        info: () => {},
+      },
+      path: optionsExtended.outputPath,
+      publicPath: optionsExtended.deployUrl,
+      compress: !!optionsExtended.minify,
+      pruneSource: false,
+      reduceInlineStyles: false,
+      mergeStylesheets: false,
+      preload: 'media',
+      noscriptFallback: true,
+      inlineFonts: true,
+      // tslint:disable-next-line: no-any
+    } as any);
+  }
+
+  public readFile(path: string): Promise<string> {
+    const readAsset = this.optionsExtended.readAsset;
+
+    return readAsset ? readAsset(path) : readFile(path, 'utf-8');
+  }
+}
+
+export class InlineCriticalCssProcessor {
+  constructor(protected readonly options: InlineCriticalCssProcessorOptions) {}
+
+  async process(
+    html: string,
+    options: InlineCriticalCssProcessOptions,
+  ): Promise<{ content: string; warnings: string[]; errors: string[] }> {
+    const critters = new CrittersExtended({ ...this.options, ...options });
+    const content = await critters.process(html);
+
+    return {
+      // Clean up value from value less attributes.
+      // This is caused because parse5 always requires attributes to have a string value.
+      // nomodule="" defer="" -> nomodule defer.
+      content: content.replace(/(\s(?:defer|nomodule))=""/g, '$1'),
+      errors: critters.errors,
+      warnings: critters.warnings,
+    };
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts
new file mode 100644
index 000000000000..069c424cfba4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts
@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { InlineCriticalCssProcessor } from './inline-critical-css';
+
+describe('InlineCriticalCssProcessor', () => {
+  const styles: Record<string, string> = {
+    '/dist/styles.css': `
+      body { margin: 0; }
+      html { color: white; }
+    `,
+    '/dist/theme.css': `
+      span { color: blue; }
+      p { color: blue; }
+    `,
+  };
+
+  const readAsset = async (file: string): Promise<string> => {
+    const content = styles[file];
+    if (content) {
+      return content;
+    }
+
+    throw new Error('Cannot read asset.');
+  };
+
+  const getContent = (deployUrl: string): string => {
+    return `
+      <html>
+      <head>
+        <link href="${deployUrl}styles.css" rel="stylesheet">
+        <link href="${deployUrl}theme.css" rel="stylesheet">
+      </head>
+      <body></body>
+    </html>`;
+  };
+
+  it('should inline critical css', async () => {
+    const inlineFontsProcessor = new InlineCriticalCssProcessor({
+      readAsset,
+    });
+
+    const { content } = await inlineFontsProcessor.process(getContent(''), {
+      outputPath: '/dist/',
+    });
+
+    expect(content).toContain(`<link href="styles.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(content).toContain(`<link href="theme.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(content).not.toContain('color: blue');
+    expect(tags.stripIndents`${content}`).toContain(tags.stripIndents`
+    <style>
+    body { margin: 0; }
+    html { color: white; }
+    </style>`);
+  });
+
+  it('should inline critical css when using deployUrl', async () => {
+    const inlineFontsProcessor = new InlineCriticalCssProcessor({
+      readAsset,
+      deployUrl: 'http://cdn.com',
+    });
+
+    const { content } = await inlineFontsProcessor.process(getContent('http://cdn.com/'), {
+      outputPath: '/dist/',
+    });
+
+    expect(content).toContain(`<link href="http://cdn.com/styles.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(content).toContain(`<link href="http://cdn.com/theme.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(tags.stripIndents`${content}`).toContain(tags.stripIndents`
+    <style>
+    body { margin: 0; }
+    html { color: white; }
+    </style>`);
+  });
+
+  it('should compress inline critical css when minify is enabled', async () => {
+    const inlineFontsProcessor = new InlineCriticalCssProcessor({
+      readAsset,
+      minify: true,
+    });
+
+    const { content } = await inlineFontsProcessor.process(getContent(''), {
+      outputPath: '/dist/',
+    });
+
+    expect(content).toContain(`<link href="styles.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(content).toContain(`<link href="theme.css" rel="stylesheet" media="print" onload="this.media='all'">`);
+    expect(content).toContain('<style>body{margin:0}html{color:white}</style>');
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts.ts
index 0345a5cddc31..ff8f7fd651c5 100644
--- a/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts.ts
@@ -1,23 +1,22 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 cacache from 'cacache';
-import { readFile as readFileAsync } from 'fs';
 import * as https from 'https';
+import * as proxyAgent from 'https-proxy-agent';
 import { URL } from 'url';
-import { promisify } from 'util';
 import { findCachePath } from '../cache-path';
 import { cachingDisabled } from '../environment-options';
+import { readFile } from '../fs';
 import { htmlRewritingStream } from './html-rewriting-stream';
 
 const cacheFontsPath: string | undefined = cachingDisabled ? undefined : findCachePath('angular-build-fonts');
 const packageVersion = require('../../../package.json').version;
-const readFile = promisify(readFileAsync);
 
 const enum UserAgent {
   Chrome = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36',
@@ -29,7 +28,7 @@ const SUPPORTED_PROVIDERS = [
 ];
 
 export interface InlineFontsOptions {
-  minifyInlinedCSS: boolean;
+  minify?: boolean;
   WOFFSupportNeeded: boolean;
 }
 
@@ -83,7 +82,7 @@ export class InlineFontsProcessor {
       if (hrefAttr) {
         const href = hrefAttr.value;
         const cssContent = hrefsContent.get(href);
-        rewriter.emitRaw(`<style type="text/css" title="${href}">${cssContent}</style>`);
+        rewriter.emitRaw(`<style type="text/css">${cssContent}</style>`);
       } else {
         rewriter.emitStartTag(tag);
       }
@@ -102,22 +101,41 @@ export class InlineFontsProcessor {
       }
     }
 
+    let agent: proxyAgent.HttpsProxyAgent | undefined;
+    const httpsProxy = process.env.HTTPS_PROXY ?? process.env.https_proxy;
+
+    if (httpsProxy) {
+      agent = proxyAgent(httpsProxy);
+    }
+
     const data = await new Promise<string>((resolve, reject) => {
       let rawResponse = '';
       https.get(
         url,
         {
+          agent,
+          rejectUnauthorized: false,
           headers: {
             'user-agent': userAgent,
           },
         },
         res => {
+          if (res.statusCode !== 200) {
+            reject(new Error(`Inlining of fonts failed. ${url} returned status code: ${res.statusCode}.`));
+
+            return;
+          }
+
           res
             .on('data', chunk => rawResponse += chunk)
             .on('end', () => resolve(rawResponse));
         },
       )
-        .on('error', e => reject(e));
+        .on('error', e =>
+          reject(new Error(
+            `Inlining of fonts failed. An error has occurred while retrieving ${url} over the internet.\n` +
+            e.message,
+          )));
     });
 
     if (cacheFontsPath) {
@@ -155,12 +173,12 @@ export class InlineFontsProcessor {
       }
       cssContent += await this.getResponse(url, UserAgent.Chrome);
 
-      if (this.options.minifyInlinedCSS) {
+      if (this.options.minify) {
         cssContent = cssContent
+          // Comments.
+          .replace(/\/\*([\s\S]*?)\*\//g, '')
           // New lines.
           .replace(/\n/g, '')
-          // Comments and new lines.
-          .replace(/\/\*\s.+\s\*\//g, '')
           // Safe spaces.
           .replace(/\s?[\{\:\;]\s+/g, s => s.trim());
       }
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts_spec.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts_spec.ts
index dbf04237ed35..1f797c87a52a 100644
--- a/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-fonts_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -18,7 +18,7 @@ describe('InlineFontsProcessor', () => {
 
   it('should inline supported fonts and icons in HTML', async () => {
     const inlineFontsProcessor = new InlineFontsProcessor({
-      minifyInlinedCSS: false,
+      minify: false,
       WOFFSupportNeeded: false,
     });
 
@@ -39,10 +39,31 @@ describe('InlineFontsProcessor', () => {
     expect(html).toContain(`font-family: 'Material Icons'`);
   });
 
+  it('should inline multiple fonts from a single request with minification enabled', async () => {
+    const inlineFontsProcessor = new InlineFontsProcessor({
+      minify: true,
+      WOFFSupportNeeded: false,
+    });
+
+    const html = await inlineFontsProcessor.process(`
+      <html>
+      <head>
+        <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500%7CGoogle+Sans:400,500%7CRoboto+Mono:400,500%7CMaterial+Icons&display=swap" rel="stylesheet">
+        <link href="theme.css" rel="stylesheet">
+      </head>
+      <body></body>
+    </html>`);
+
+    expect(html).toContain(`'Google Sans'`);
+    expect(html).toContain(`'Roboto'`);
+    expect(html).toContain(`'Roboto Mono'`);
+    expect(html).toContain(`'Material Icons'`);
+  });
+
   it('works with http protocol', async () => {
     const inlineFontsProcessor = new InlineFontsProcessor({
       WOFFSupportNeeded: false,
-      minifyInlinedCSS: false,
+      minify: false,
     });
 
     const html = await inlineFontsProcessor
@@ -53,7 +74,7 @@ describe('InlineFontsProcessor', () => {
   it('works with // protocol', async () => {
     const inlineFontsProcessor = new InlineFontsProcessor({
       WOFFSupportNeeded: false,
-      minifyInlinedCSS: false,
+      minify: false,
     });
 
     const html = await inlineFontsProcessor
@@ -64,7 +85,7 @@ describe('InlineFontsProcessor', () => {
   it('should include WOFF1 definitions when `WOFF1SupportNeeded` is true', async () => {
     const inlineFontsProcessor = new InlineFontsProcessor({
       WOFFSupportNeeded: true,
-      minifyInlinedCSS: false,
+      minify: false,
     });
 
     const html = await inlineFontsProcessor.process(content);
@@ -75,7 +96,7 @@ describe('InlineFontsProcessor', () => {
   it('should remove comments and line breaks when `minifyInlinedCSS` is true', async () => {
     const inlineFontsProcessor = new InlineFontsProcessor({
       WOFFSupportNeeded: false,
-      minifyInlinedCSS: true,
+      minify: true,
     });
 
     const html = await inlineFontsProcessor.process(content);
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/transforms.ts b/packages/angular_devkit/build_angular/src/utils/index-file/transforms.ts
deleted file mode 100644
index 27c7e4f431af..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/index-file/transforms.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 { BuildBrowserFeatures } from '../build-browser-features';
-import { NormalizeOptimizationOptions } from '../normalize-optimization';
-import { InlineFontsProcessor } from './inline-fonts';
-import { IndexHtmlTransform } from './write-index-html';
-
-export function getHtmlTransforms(
-  optimization: NormalizeOptimizationOptions,
-  buildBrowserFeatures: BuildBrowserFeatures,
-  extraHtmlTransform?: IndexHtmlTransform,
-): IndexHtmlTransform[] {
-  const indexTransforms: IndexHtmlTransform[] = [];
-  const { fonts, styles } = optimization;
-
-  // Inline fonts
-  if (fonts.inline) {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      minifyInlinedCSS: styles,
-      WOFFSupportNeeded: !buildBrowserFeatures.isFeatureSupported('woff2'),
-    });
-
-    indexTransforms.push(content => inlineFontsProcessor.process(content));
-  }
-
-  if (extraHtmlTransform) {
-    indexTransforms.push(extraHtmlTransform);
-  }
-
-  return indexTransforms;
-}
-
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/write-index-html.ts b/packages/angular_devkit/build_angular/src/utils/index-file/write-index-html.ts
deleted file mode 100644
index 7c9f943ffe08..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/index-file/write-index-html.ts
+++ /dev/null
@@ -1,95 +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 { EmittedFiles } from '@angular-devkit/build-webpack';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { dirname, join } from 'path';
-import { ExtraEntryPoint } from '../../browser/schema';
-import { generateEntryPoints } from '../package-chunk-sort';
-import { stripBom } from '../strip-bom';
-import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-html';
-
-type ExtensionFilter = '.js' | '.css';
-
-export interface WriteIndexHtmlOptions {
-  host: virtualFs.Host;
-  outputPath: string;
-  indexPath: string;
-  files?: EmittedFiles[];
-  noModuleFiles?: EmittedFiles[];
-  moduleFiles?: EmittedFiles[];
-  baseHref?: string;
-  deployUrl?: string;
-  sri?: boolean;
-  scripts?: ExtraEntryPoint[];
-  styles?: ExtraEntryPoint[];
-  postTransforms: IndexHtmlTransform[];
-  crossOrigin?: CrossOriginValue;
-  lang?: string;
-}
-
-export type IndexHtmlTransform = (content: string) => Promise<string>;
-
-export async function writeIndexHtml({
-  host,
-  outputPath,
-  indexPath,
-  files = [],
-  noModuleFiles = [],
-  moduleFiles = [],
-  baseHref,
-  deployUrl,
-  sri = false,
-  scripts = [],
-  styles = [],
-  postTransforms,
-  crossOrigin,
-  lang,
-}: WriteIndexHtmlOptions): Promise<void> {
-  const readFile = async (filePath: string) =>
-    virtualFs.fileBufferToString(await host.read(normalize(filePath)).toPromise());
-
-  let content = await augmentIndexHtml({
-    input: outputPath,
-    inputContent: stripBom(await readFile(indexPath)),
-    baseHref,
-    deployUrl,
-    crossOrigin,
-    sri,
-    lang,
-    entrypoints: generateEntryPoints({ scripts, styles }),
-    files: filterAndMapBuildFiles(files, ['.js', '.css']),
-    noModuleFiles: filterAndMapBuildFiles(noModuleFiles, '.js'),
-    moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
-    loadOutputFile: filePath => readFile(join(dirname(outputPath), filePath)),
-  });
-
-  for (const transform of postTransforms) {
-    content = await transform(content);
-  }
-
-  await host.write(normalize(outputPath), virtualFs.stringToFileBuffer(content)).toPromise();
-}
-
-function filterAndMapBuildFiles(
-  files: EmittedFiles[],
-  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 && validExtensions.includes(extension)) {
-      filteredFiles.push({ file, extension, name });
-    }
-  }
-
-  return filteredFiles;
-}
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 47bdbc914ce9..43a3a70cae25 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/is-directory.ts b/packages/angular_devkit/build_angular/src/utils/is-directory.ts
index f4636a272531..9682c539538c 100644
--- a/packages/angular_devkit/build_angular/src/utils/is-directory.ts
+++ b/packages/angular_devkit/build_angular/src/utils/is-directory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/load-translations.ts b/packages/angular_devkit/build_angular/src/utils/load-translations.ts
index b76b4bd3541f..63edde697372 100644
--- a/packages/angular_devkit/build_angular/src/utils/load-translations.ts
+++ b/packages/angular_devkit/build_angular/src/utils/load-translations.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -66,6 +66,10 @@ async function importParsers() {
     const diagnostics = new localizeDiag.Diagnostics();
 
     const parsers = {
+      arb: new (await import(
+        // tslint:disable-next-line:trailing-comma
+        '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/arb_translation_parser'
+        )).ArbTranslationParser(),
       json: new (await import(
         // tslint:disable-next-line:trailing-comma
         '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser'
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 528d526fab0e..a04759521876 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,12 +10,13 @@ import {
   Path,
   basename,
   dirname,
+  getSystemPath,
   join,
   normalize,
   relative,
   resolve,
-  virtualFs,
 } from '@angular-devkit/core';
+import { statSync } from 'fs';
 import { AssetPattern, AssetPatternClass } from '../browser/schema';
 
 
@@ -27,7 +28,6 @@ export class MissingAssetSourceRootException extends BaseException {
 
 export function normalizeAssetPatterns(
   assetPatterns: AssetPattern[],
-  host: virtualFs.SyncDelegateHost,
   root: Path,
   projectRoot: Path,
   maybeSourceRoot: Path | undefined,
@@ -56,7 +56,7 @@ export function normalizeAssetPatterns(
         let isDirectory = false;
 
         try {
-          isDirectory = host.isDirectory(resolvedAssetPath);
+          isDirectory = statSync(getSystemPath(resolvedAssetPath)).isDirectory();
         } catch {
           isDirectory = true;
         }
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 2d11fdb82375..ee4b70a84aa4 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
@@ -1,17 +1,16 @@
 
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import {
   AssetPatternClass,
-  OptimizationClass,
   Schema as BrowserBuilderSchema,
   SourceMapClass,
 } from '../browser/schema';
@@ -21,7 +20,7 @@ import {
   NormalizedFileReplacement,
   normalizeFileReplacements,
 } from './normalize-file-replacements';
-import { normalizeOptimization } from './normalize-optimization';
+import { NormalizedOptimizationOptions, normalizeOptimization } from './normalize-optimization';
 import { normalizeSourceMaps } from './normalize-source-maps';
 
 
@@ -32,23 +31,21 @@ export type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & BuildOptions
   sourceMap: SourceMapClass;
   assets: AssetPatternClass[];
   fileReplacements: NormalizedFileReplacement[];
-  optimization: OptimizationClass;
+  optimization: NormalizedOptimizationOptions;
 };
 
 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 || false);
 
   return {
     ...options,
-    assets: normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
-    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
+    assets: normalizeAssetPatterns(options.assets || [], root, projectRoot, sourceRoot),
+    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], root),
     optimization: normalizeOptimization(options.optimization),
     sourceMap: normalizedSourceMapOptions,
     preserveSymlinks: options.preserveSymlinks === undefined ? process.execArgv.includes('--preserve-symlinks') : options.preserveSymlinks,
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 d5c3425a4ac2..c9cb6545fc89 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -12,8 +12,8 @@ import {
   getSystemPath,
   join,
   normalize,
-  virtualFs,
 } from '@angular-devkit/core';
+import { existsSync } from 'fs';
 import { FileReplacement } from '../browser/schema';
 
 
@@ -30,7 +30,6 @@ export interface NormalizedFileReplacement {
 
 export function normalizeFileReplacements(
   fileReplacements: FileReplacement[],
-  host: virtualFs.SyncDelegateHost,
   root: Path,
 ): NormalizedFileReplacement[] {
   if (fileReplacements.length === 0) {
@@ -41,11 +40,11 @@ export function normalizeFileReplacements(
     .map(replacement => normalizeFileReplacement(replacement, root));
 
   for (const { replace, with: replacementWith } of normalizedReplacement) {
-    if (!host.exists(replacementWith)) {
+    if (!existsSync(getSystemPath(replacementWith))) {
       throw new MissingFileReplacementException(getSystemPath(replacementWith));
     }
 
-    if (!host.exists(replace)) {
+    if (!existsSync(getSystemPath(replace))) {
       throw new MissingFileReplacementException(getSystemPath(replace));
     }
   }
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 9bd503355286..29c5880bf477 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -1,22 +1,27 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { FontsClass, OptimizationClass, OptimizationUnion } from '../browser/schema';
+import { FontsClass, OptimizationClass, OptimizationUnion, StylesClass } from '../browser/schema';
 
-export type NormalizeOptimizationOptions = Required<Omit<OptimizationClass, 'fonts'>> & {
+export type NormalizedOptimizationOptions = Required<Omit<OptimizationClass, 'fonts' | 'styles'>> & {
   fonts: FontsClass,
+  styles: StylesClass,
 };
 
-export function normalizeOptimization(optimization: OptimizationUnion = false): NormalizeOptimizationOptions {
+export function normalizeOptimization(optimization: OptimizationUnion = false): NormalizedOptimizationOptions {
   if (typeof optimization === 'object') {
     return {
       scripts: !!optimization.scripts,
-      styles: !!optimization.styles,
+      styles: typeof optimization.styles === 'object' ? optimization.styles : {
+        minify: !!optimization.styles,
+        // inlineCritical is always false unless explictly set.
+        inlineCritical: false,
+      },
       fonts: typeof optimization.fonts === 'object' ? optimization.fonts : {
         inline: !!optimization.fonts,
       },
@@ -25,7 +30,11 @@ export function normalizeOptimization(optimization: OptimizationUnion = false):
 
   return {
     scripts: optimization,
-    styles: optimization,
+    styles: {
+      minify: optimization,
+      // inlineCritical is always false unless explictly set.
+      inlineCritical: false,
+    },
     fonts: {
       inline: 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 ca873b59fa95..f4f8d804d65c 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/output-paths.ts b/packages/angular_devkit/build_angular/src/utils/output-paths.ts
index 45f0729953cc..c581bf1d4d21 100644
--- a/packages/angular_devkit/build_angular/src/utils/output-paths.ts
+++ b/packages/angular_devkit/build_angular/src/utils/output-paths.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
index 506d5e3b78c5..82864782f634 100644
--- a/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 import { ExtraEntryPoint } from '../browser/schema';
-import { normalizeExtraEntryPoints } from '../webpack/configs';
+import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 
 export function generateEntryPoints(appConfig: {
   styles: ExtraEntryPoint[];
diff --git a/packages/angular_devkit/build_angular/src/utils/process-bundle-bootstrap.js b/packages/angular_devkit/build_angular/src/utils/process-bundle-bootstrap.js
index b2b1965f4c67..aa51feffe3b5 100644
--- a/packages/angular_devkit/build_angular/src/utils/process-bundle-bootstrap.js
+++ b/packages/angular_devkit/build_angular/src/utils/process-bundle-bootstrap.js
@@ -1,9 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 require('../../../../../lib/bootstrap-local');
-module.exports = require('./process-bundle.ts');
\ No newline at end of file
+module.exports = require('./process-bundle.ts');
diff --git a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
index c806b9fa351b..b66d54afd8c9 100644
--- a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
+++ b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -32,7 +32,6 @@ import {
 } from 'webpack-sources';
 import { allowMangle, allowMinify, shouldBeautify } from './environment-options';
 import { I18nOptions } from './i18n-options';
-import { isWebpackFiveOrHigher } from './webpack-version';
 
 type LocalizeUtilities = typeof import('@angular/localize/src/tools/src/source_file_utils');
 
@@ -220,8 +219,7 @@ async function mergeSourceMaps(
   fast = false,
 ): Promise<RawSourceMap> {
   // Webpack 5 terser sourcemaps currently fail merging with the high-quality method
-  // TODO_WEBPACK_5: Investigate high-quality sourcemap merge failures
-  if (fast || isWebpackFiveOrHigher()) {
+  if (fast) {
     return mergeSourceMapsFast(inputSourceMap, resultSourceMap);
   }
 
@@ -400,6 +398,7 @@ async function terserMangle(
       ascii_only: true,
       webkit: true,
       beautify: shouldBeautify,
+      wrap_func_args: false,
     },
     sourceMap:
       !!options.map &&
@@ -551,6 +550,7 @@ export async function createI18nPlugins(
   locale: string,
   translation: unknown | undefined,
   missingTranslation: 'error' | 'warning' | 'ignore',
+  shouldInline: boolean,
   localeDataContent?: string,
 ) {
   const plugins = [];
@@ -558,27 +558,29 @@ export async function createI18nPlugins(
 
   const diagnostics = new localizeDiag.Diagnostics();
 
-  const es2015 = await import(
-    // tslint:disable-next-line: trailing-comma
-    '@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin'
-  );
-  plugins.push(
-    // tslint:disable-next-line: no-any
-    es2015.makeEs2015TranslatePlugin(diagnostics, (translation || {}) as any, {
-      missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
-    }),
-  );
+  if (shouldInline) {
+    const es2015 = await import(
+      // tslint:disable-next-line: trailing-comma
+      '@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin'
+    );
+    plugins.push(
+      // tslint:disable-next-line: no-any
+      es2015.makeEs2015TranslatePlugin(diagnostics, (translation || {}) as any, {
+        missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
+      }),
+    );
 
-  const es5 = await import(
-    // tslint:disable-next-line: trailing-comma
-    '@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin'
-  );
-  plugins.push(
-    // tslint:disable-next-line: no-any
-    es5.makeEs5TranslatePlugin(diagnostics, (translation || {}) as any, {
-      missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
-    }),
-  );
+    const es5 = await import(
+      // tslint:disable-next-line: trailing-comma
+      '@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin'
+    );
+    plugins.push(
+      // tslint:disable-next-line: no-any
+      es5.makeEs5TranslatePlugin(diagnostics, (translation || {}) as any, {
+        missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
+      }),
+    );
+  }
 
   const inlineLocale = await import(
     // tslint:disable-next-line: trailing-comma
@@ -677,6 +679,7 @@ export async function inlineLocales(options: InlineOptions) {
       locale,
       translations,
       isSourceLocale ? 'ignore' : options.missingTranslation || 'warning',
+      true,
       localeDataContent,
     );
     const transformResult = await transformFromAstSync(ast, options.code, {
diff --git a/packages/angular_devkit/build_angular/src/utils/read-tsconfig.ts b/packages/angular_devkit/build_angular/src/utils/read-tsconfig.ts
index 9d58349af889..0f6f7de3eef7 100644
--- a/packages/angular_devkit/build_angular/src/utils/read-tsconfig.ts
+++ b/packages/angular_devkit/build_angular/src/utils/read-tsconfig.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 ab13efdb0e2b..6a7fff08744c 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/run-module-worker.js b/packages/angular_devkit/build_angular/src/utils/run-module-worker.js
index 2370abead79b..86c96099c89e 100644
--- a/packages/angular_devkit/build_angular/src/utils/run-module-worker.js
+++ b/packages/angular_devkit/build_angular/src/utils/run-module-worker.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -17,4 +17,3 @@ process.on('message', (message) => {
     }
   }
 });
-
diff --git a/packages/angular_devkit/build_angular/src/utils/service-worker.ts b/packages/angular_devkit/build_angular/src/utils/service-worker.ts
index bb712e5b7894..01dcb210f49b 100644
--- a/packages/angular_devkit/build_angular/src/utils/service-worker.ts
+++ b/packages/angular_devkit/build_angular/src/utils/service-worker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -15,10 +15,11 @@ import {
   tags,
   virtualFs,
 } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import {
   Filesystem,
   Generator,
-} from '@angular/service-worker/config'; // tslint:disable-line:no-implicit-dependencies
+} from '@angular/service-worker/config';
 import * as crypto from 'crypto';
 
 class CliFilesystem implements Filesystem {
@@ -70,13 +71,13 @@ class CliFilesystem implements Filesystem {
 }
 
 export async function augmentAppWithServiceWorker(
-  host: virtualFs.Host,
   projectRoot: Path,
   appRoot: Path,
   outputPath: Path,
   baseHref: string,
   ngswConfigPath?: string,
 ): Promise<void> {
+  const host = new NodeJsSyncHost();
   const distPath = normalize(outputPath);
   const systemProjectRoot = getSystemPath(projectRoot);
 
diff --git a/packages/angular_devkit/build_angular/src/utils/spinner.ts b/packages/angular_devkit/build_angular/src/utils/spinner.ts
new file mode 100644
index 000000000000..b4b0ded050ed
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/spinner.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 ora from 'ora';
+import { colors } from './color';
+
+export class Spinner {
+  private readonly spinner: ora.Ora;
+
+  /** When false, only fail messages will be displayed. */
+  enabled = true;
+
+  constructor(text?: string) {
+    this.spinner = ora({
+      text,
+      // The below 2 options are needed because otherwise CTRL+C will be delayed
+      // when the underlying process is sync.
+      hideCursor: false,
+      discardStdin: false,
+    });
+  }
+
+  set text(text: string) {
+    this.spinner.text = text;
+  }
+
+  succeed(text?: string): void {
+    if (this.enabled) {
+      this.spinner.succeed(text);
+    }
+  }
+
+  fail(text?: string): void {
+    this.spinner.fail(text && colors.redBright(text));
+  }
+
+  stop(): void {
+    this.spinner.stop();
+  }
+
+  start(text?: string): void {
+    if (this.enabled) {
+      this.spinner.start(text);
+    }
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/strip-bom.ts b/packages/angular_devkit/build_angular/src/utils/strip-bom.ts
index f4aba38228b3..564c3894777a 100644
--- a/packages/angular_devkit/build_angular/src/utils/strip-bom.ts
+++ b/packages/angular_devkit/build_angular/src/utils/strip-bom.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/tty.ts b/packages/angular_devkit/build_angular/src/utils/tty.ts
index dd5931e26fb6..1e5658ebfd57 100644
--- a/packages/angular_devkit/build_angular/src/utils/tty.ts
+++ b/packages/angular_devkit/build_angular/src/utils/tty.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/url.ts b/packages/angular_devkit/build_angular/src/utils/url.ts
index 39b047b407bb..936225d6fc82 100644
--- a/packages/angular_devkit/build_angular/src/utils/url.ts
+++ b/packages/angular_devkit/build_angular/src/utils/url.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/url_spec.ts b/packages/angular_devkit/build_angular/src/utils/url_spec.ts
index ca0d7935a741..9f8c6fa3c5e1 100644
--- a/packages/angular_devkit/build_angular/src/utils/url_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/url_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/version.ts b/packages/angular_devkit/build_angular/src/utils/version.ts
index 32da8a8ab976..72ca02702bf2 100644
--- a/packages/angular_devkit/build_angular/src/utils/version.ts
+++ b/packages/angular_devkit/build_angular/src/utils/version.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -41,7 +41,7 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
     const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
     angularCliPkgJson = require(angularCliPkgPath);
     if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
-      throw new Error();
+      return;
     }
   } catch {
     // Not using @angular-devkit/build-angular with @angular/cli is ok too.
@@ -49,20 +49,17 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
     return;
   }
 
-  if (angularCliPkgJson['version'] === '0.0.0') {
-    // Internal testing version
+  if (angularCliPkgJson['version'] === '0.0.0' || angularPkgJson['version'] === '0.0.0') {
+    // Internal CLI testing version or integration testing in the angular/angular
+    // repository with the generated development @angular/core npm package which is versioned "0.0.0".
     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. Also allow version "0.0.0" for integration testing in the angular/angular
-  // repository with the generated development @angular/core npm package which is versioned "0.0.0".
-  const supportedAngularSemver =
-    `0.0.0 || ^${cliMajor}.0.0-beta || ` + `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
-
   const angularVersion = new SemVer(angularPkgJson['version']);
-  const rxjsVersion = new SemVer(rxjsPkgJson['version']);
+  const cliMajor = new SemVer(angularCliPkgJson['version']).major;
+  // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (next, rcs, snapshots)
+  // of both 8 and 9.
+  const supportedAngularSemver = `^${cliMajor}.0.0-next || >=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
 
   if (!satisfies(angularVersion, supportedAngularSemver, { includePrerelease: true })) {
     logger.error(
@@ -76,30 +73,5 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
     );
 
     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',
-    );
   }
 }
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 abda3c9974a9..a82866993d1e 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -11,10 +11,7 @@ import {
   logging,
   normalize,
   resolve,
-  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 { merge as webpackMerge } from 'webpack-merge';
@@ -26,6 +23,7 @@ import {
 } from '../utils';
 import { WebpackConfigOptions } from '../utils/build-options';
 import { readTsconfig } from '../utils/read-tsconfig';
+import { BuilderWatchPlugin, BuilderWatcherFactory } from '../webpack/plugins/builder-watch-plugin';
 import { getEsVersionForFileName } from '../webpack/utils/helpers';
 import { profilingEnabled } from './environment-options';
 import { I18nOptions, configureI18nBuild } from './i18n-options';
@@ -61,7 +59,6 @@ export async function generateWebpackConfig(
   const tsConfigPath = path.resolve(workspaceRoot, options.tsConfig);
   const tsConfig = readTsconfig(tsConfigPath);
 
-  // tslint:disable-next-line:no-implicit-dependencies
   const ts = await import('typescript');
   const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
 
@@ -76,7 +73,7 @@ export async function generateWebpackConfig(
     buildOptions,
     tsConfig,
     tsConfigPath,
-    supportES2015,
+    scriptTarget,
   };
 
   wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
@@ -103,7 +100,7 @@ export async function generateWebpackConfig(
   if (profilingEnabled) {
     const esVersionInFileName = getEsVersionForFileName(
       tsConfig.options.target,
-      buildOptions.differentialLoadingMode,
+      buildOptions.differentialLoadingNeeded,
     );
 
     const SpeedMeasurePlugin = await import('speed-measure-webpack-plugin');
@@ -125,7 +122,6 @@ export async function generateI18nBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
-  host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
   extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
 ): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string, i18n: I18nOptions }> {
   const { buildOptions, i18n } = await configureI18nBuild(context, options);
@@ -133,7 +129,6 @@ export async function generateI18nBrowserWebpackConfigFromContext(
     buildOptions,
     context,
     webpackPartialGenerator,
-    host,
     extraBuildOptions,
   );
   const config = result.config;
@@ -195,7 +190,6 @@ export async function generateBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
-  host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
   extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
 ): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string }> {
   const projectName = context.target && context.target.project;
@@ -212,7 +206,6 @@ export async function generateBrowserWebpackConfigFromContext(
     : undefined;
 
   const normalizedOptions = normalizeBrowserSchema(
-    host,
     workspaceRoot,
     projectRoot,
     sourceRoot,
@@ -229,6 +222,18 @@ export async function generateBrowserWebpackConfigFromContext(
     extraBuildOptions,
   );
 
+  // If builder watch support is present in the context, add watch plugin
+  // This is internal only and currently only used for testing
+  const watcherFactory = (context as {
+    watcherFactory?: BuilderWatcherFactory;
+  }).watcherFactory;
+  if (watcherFactory) {
+    if (!config.plugins) {
+      config.plugins = [];
+    }
+    config.plugins.push(new BuilderWatchPlugin(watcherFactory));
+  }
+
   return {
     config,
     projectRoot: getSystemPath(projectRoot),
@@ -236,18 +241,18 @@ export async function generateBrowserWebpackConfigFromContext(
   };
 }
 
-export function getIndexOutputFile(options: BrowserBuilderSchema): string {
-  if (typeof options.index === 'string') {
-    return path.basename(options.index);
+export function getIndexOutputFile(index: BrowserBuilderSchema['index']): string {
+  if (typeof index === 'string') {
+    return path.basename(index);
   } else {
-    return options.index.output || 'index.html';
+    return index.output || 'index.html';
   }
 }
 
-export function getIndexInputFile(options: BrowserBuilderSchema): string {
-  if (typeof options.index === 'string') {
-    return options.index;
+export function getIndexInputFile(index: BrowserBuilderSchema['index']): string {
+  if (typeof index === 'string') {
+    return index;
   } else {
-    return options.index.input;
+    return index.input;
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts b/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts
index d7ea3b4c44d6..43897ba03c0a 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-version.ts b/packages/angular_devkit/build_angular/src/utils/webpack-version.ts
index 3cb37086265c..f32c33347b10 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-version.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-version.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/utils/workers.ts b/packages/angular_devkit/build_angular/src/utils/workers.ts
index 83b4c778fff8..d0e47eb850cc 100644
--- a/packages/angular_devkit/build_angular/src/utils/workers.ts
+++ b/packages/angular_devkit/build_angular/src/utils/workers.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts b/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
index 0ac41b988246..8ee843fa3cc0 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
@@ -1,16 +1,14 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 * as webpack from 'webpack';
 import { WebpackConfigOptions } from '../../utils/build-options';
 import { withWebpackFourOrFive } from '../../utils/webpack-version';
 import { CommonJsUsageWarnPlugin } from '../plugins';
-import { HmrLoader } from '../plugins/hmr/hmr-loader';
 import { getSourceMapDevTool } from '../utils/helpers';
 
 export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configuration {
@@ -22,7 +20,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     vendorChunk,
     commonChunk,
     allowedCommonJsDependencies,
-    hmr,
   } = buildOptions;
 
   const extraPlugins = [];
@@ -31,7 +28,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     styles: stylesSourceMap,
     scripts: scriptsSourceMap,
     hidden: hiddenSourceMap,
-    vendor: vendorSourceMap,
   } = buildOptions.sourceMap;
 
   if (subresourceIntegrity) {
@@ -50,6 +46,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
       },
       perChunkOutput: false,
       outputFilename: '3rdpartylicenses.txt',
+      skipChildCompilers: true,
     }));
   }
 
@@ -57,9 +54,8 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     extraPlugins.push(getSourceMapDevTool(
       scriptsSourceMap,
       stylesSourceMap,
-      buildOptions.differentialLoadingMode ? true : hiddenSourceMap,
+      buildOptions.differentialLoadingNeeded && !buildOptions.watch ? true : hiddenSourceMap,
       false,
-      vendorSourceMap,
     ));
   }
 
@@ -70,24 +66,11 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     crossOriginLoading = crossOrigin;
   }
 
-  const extraRules: webpack.RuleSetRule[] = [];
-  if (hmr) {
-    extraRules.push({
-      loader: HmrLoader,
-      include: [buildOptions.main].map(p => resolve(wco.root, p)),
-    });
-
-    extraPlugins.push(new webpack.HotModuleReplacementPlugin());
-  }
-
   return {
     devtool: false,
     resolve: {
       mainFields: ['es2015', 'browser', 'module', 'main'],
     },
-    module: {
-      rules: extraRules,
-    },
     ...withWebpackFourOrFive({}, { target: ['web', 'es5'] }),
     output: {
       crossOriginLoading,
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
index 905488765e9c..91fcdcabcc99 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,9 +9,8 @@ import {
   BuildOptimizerWebpackPlugin,
   buildOptimizerLoaderPath,
 } from '@angular-devkit/build-optimizer';
-import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
-import { existsSync } from 'fs';
+import { createWriteStream, existsSync, promises as fsPromises } from 'fs';
 import * as path from 'path';
 import { RollupOptions } from 'rollup';
 import { ScriptTarget } from 'typescript';
@@ -24,7 +23,6 @@ import {
   compilation,
   debug,
 } from 'webpack';
-import { RawSource } from 'webpack-sources';
 import { AssetPatternClass } from '../../browser/schema';
 import { BuildBrowserFeatures, maxWorkers } from '../../utils';
 import { WebpackConfigOptions } from '../../utils/build-options';
@@ -37,16 +35,18 @@ import {
   shouldBeautify,
 } from '../../utils/environment-options';
 import { findAllNodeModules } from '../../utils/find-up';
+import { Spinner } from '../../utils/spinner';
+import { addError } from '../../utils/webpack-diagnostics';
 import { isWebpackFiveOrHigher, withWebpackFourOrFive } from '../../utils/webpack-version';
 import {
-  BundleBudgetPlugin,
   DedupeModuleResolvePlugin,
   NamedLazyChunksPlugin,
   OptimizeCssWebpackPlugin,
   ScriptsWebpackPlugin,
   WebpackRollupLoader,
 } from '../plugins';
-import { getEsVersionForFileName, getOutputHashFormat, normalizeExtraEntryPoints } from '../utils/helpers';
+import { getEsVersionForFileName, getOutputHashFormat, getWatchOptions, normalizeExtraEntryPoints } from '../utils/helpers';
+import { IGNORE_WARNINGS } from '../utils/stats';
 
 const TerserPlugin = require('terser-webpack-plugin');
 const PnpWebpackPlugin = require('pnp-webpack-plugin');
@@ -54,12 +54,18 @@ const PnpWebpackPlugin = require('pnp-webpack-plugin');
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const { root, projectRoot, buildOptions, tsConfig } = wco;
-  const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
-    styles: stylesSourceMap,
-    scripts: scriptsSourceMap,
-    vendor: vendorSourceMap,
-  } = buildOptions.sourceMap;
+    platform = 'browser',
+    sourceMap: {
+      styles: stylesSourceMap,
+      scripts: scriptsSourceMap,
+      vendor: vendorSourceMap,
+    },
+    optimization: {
+      styles: stylesOptimization,
+      scripts: scriptsOptimization,
+    },
+  } = buildOptions;
 
   const extraPlugins: { apply(compiler: Compiler): void }[] = [];
   const extraRules: RuleSetRule[] = [];
@@ -70,7 +76,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   const targetInFileName = getEsVersionForFileName(
     tsConfig.options.target,
-    buildOptions.differentialLoadingMode,
+    buildOptions.differentialLoadingNeeded,
   );
 
   if (buildOptions.main) {
@@ -121,8 +127,8 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     }
   }
 
-  const differentialLoadingMode = buildOptions.differentialLoadingMode;
-  if (wco.buildOptions.platform !== 'server') {
+  const differentialLoadingMode = buildOptions.differentialLoadingNeeded && !buildOptions.watch;
+  if (platform !== 'server') {
     if (differentialLoadingMode || tsConfig.options.target === ScriptTarget.ES5) {
       const buildBrowserFeatures = new BuildBrowserFeatures(
         projectRoot,
@@ -242,7 +248,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     return prev;
   }, []);
 
-    // Add a new asset for each entry.
+  // Add a new asset for each entry.
   for (const script of globalScriptsByBundleName) {
     // Lazy scripts don't get a hash, otherwise they can't be loaded by name.
     const hash = script.inject ? hashFormat.script : '';
@@ -280,6 +286,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         force: true,
         globOptions: {
           dot: true,
+          followSymbolicLinks: !!asset.followSymlinks,
           ignore: [
             '.gitkeep',
             '**/.DS_Store',
@@ -300,7 +307,23 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   if (buildOptions.progress) {
     const ProgressPlugin = require('webpack/lib/ProgressPlugin');
-    extraPlugins.push(new ProgressPlugin({ profile: buildOptions.verbose }));
+    const spinner = new Spinner();
+
+    extraPlugins.push(new ProgressPlugin({
+      handler: (percentage: number, message: string) => {
+        switch (percentage) {
+          case 0:
+            spinner.start(`Generating ${platform} application bundles...`);
+            break;
+          case 1:
+            spinner.succeed(`${platform.replace(/^\w/, s => s.toUpperCase())} application bundle generation complete.`);
+            break;
+          default:
+            spinner.text = `Generating ${platform} application bundles (phase: ${message})...`;
+            break;
+        }
+      },
+    }));
   }
 
   if (buildOptions.showCircularDependencies) {
@@ -316,9 +339,26 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     extraPlugins.push(
       new (class {
         apply(compiler: Compiler) {
-          compiler.hooks.emit.tap('angular-cli-stats', compilation => {
-            const data = JSON.stringify(compilation.getStats().toJson('verbose'), undefined, 2);
-            compilation.assets['stats.json'] = new RawSource(data);
+          compiler.hooks.done.tapPromise('angular-cli-stats', async (stats) => {
+            const { stringifyStream } = await import('@discoveryjs/json-ext');
+            const data = stats.toJson('verbose');
+            const statsOutputPath = path.join(stats.compilation.outputOptions.path, 'stats.json');
+
+            try {
+              await fsPromises.mkdir(path.dirname(statsOutputPath), { recursive: true });
+
+              await new Promise<void>((resolve, reject) =>
+                stringifyStream(data)
+                  .pipe(createWriteStream(statsOutputPath))
+                  .on('close', resolve)
+                  .on('error', reject),
+              );
+            } catch (error) {
+              addError(
+                stats.compilation,
+                `Unable to write stats file: ${error.message || 'unknown error'}`,
+              );
+            }
           });
         }
       })(),
@@ -327,18 +367,22 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   if (buildOptions.namedChunks && !isWebpackFiveOrHigher()) {
     extraPlugins.push(new NamedLazyChunksPlugin());
-  }
 
-  if (!differentialLoadingMode) {
-    // Budgets are computed after differential builds, not via a plugin.
-    // https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/src/browser/index.ts
-    extraPlugins.push(new BundleBudgetPlugin({ budgets: buildOptions.budgets }));
+    // Provide full names for lazy routes that use the deprecated string format
+    extraPlugins.push(
+      new ContextReplacementPlugin(
+        /\@angular[\\\/]core[\\\/]/,
+        (data: { chunkName?: string }) => (data.chunkName = '[request]'),
+      ),
+    );
   }
 
-  if ((scriptsSourceMap || stylesSourceMap) && vendorSourceMap) {
+  if ((scriptsSourceMap || stylesSourceMap)) {
     extraRules.push({
       test: /\.m?js$/,
-      exclude: /(ngfactory|ngstyle)\.js$/,
+      exclude: vendorSourceMap
+        ? /(ngfactory|ngstyle)\.js$/
+        : [/[\\\/]node_modules[\\\/]/, /(ngfactory|ngstyle)\.js$/],
       enforce: 'pre',
       loader: require.resolve('source-map-loader'),
     });
@@ -356,7 +400,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   const extraMinimizers = [];
-  if (stylesOptimization) {
+  if (stylesOptimization.minify) {
     extraMinimizers.push(
       new OptimizeCssWebpackPlugin({
         sourceMap: stylesSourceMap,
@@ -387,12 +431,13 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         comments: !buildOptions.extractLicenses && undefined,
         webkit: true,
         beautify: shouldBeautify,
+        wrap_func_args: false,
       },
       // 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:
         allowMinify &&
-        (buildOptions.platform == 'server'
+        (platform === 'server'
           ? {
             ecma: terserEcma,
             global_defs: angularGlobalDefinitions,
@@ -405,10 +450,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
             // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
             passes: buildOptions.buildOptimizer ? 3 : 1,
             global_defs: angularGlobalDefinitions,
+            pure_funcs: ['forwardRef'],
           }),
       // We also want to avoid mangling on server.
       // Name mangling is handled within the browser builder
-      mangle: allowMangle && buildOptions.platform !== 'server' && !differentialLoadingMode,
+      mangle: allowMangle && platform !== 'server' && !differentialLoadingMode,
     };
 
     const globalScriptsNames = globalScriptsByBundleName.map(s => s.bundleName);
@@ -439,25 +485,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
             ...terserOptions.output,
             ecma: 5,
           },
-          mangle: allowMangle && buildOptions.platform !== 'server',
+          mangle: allowMangle && platform !== 'server',
         },
       }),
     );
   }
 
-  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.
-      See: https://github.com/angular/zone.js/pull/1140 for more information.
-    `);
-  }
-
   return {
-    mode: scriptsOptimization || stylesOptimization ? 'production' : 'development',
+    mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
     devtool: false,
     profile: buildOptions.statsJson,
     resolve: {
@@ -487,27 +522,22 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       filename: `[name]${targetInFileName}${hashFormat.chunk}.js`,
     },
     watch: buildOptions.watch,
-    watchOptions: {
-      poll: buildOptions.poll,
-      ignored:
-        buildOptions.poll === undefined
-          ? undefined
-          : withWebpackFourOrFive(/[\\\/]node_modules[\\\/]/, 'node_modules/**'),
-    },
+    watchOptions: getWatchOptions(buildOptions.poll),
     performance: {
       hints: false,
     },
+    ...withWebpackFourOrFive({}, { ignoreWarnings: IGNORE_WARNINGS }),
     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)$/,
+          test: /\.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani|avif)$/,
           loader: require.resolve('file-loader'),
           options: {
             name: `[name]${hashFormat.file}.[ext]`,
             // Re-use emitted files from browser builder on the server.
-            emitFile: wco.buildOptions.platform !== 'server',
+            emitFile: platform !== 'server',
           },
         },
         {
@@ -524,51 +554,16 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           sideEffects: true,
         },
         {
-          test: /\.m?js$/,
-          exclude: [/[\/\\](?:core-js|\@babel|tslib)[\/\\]/, /(ngfactory|ngstyle)\.js$/],
+          test: /\.[cm]?js$|\.tsx?$/,
+          exclude: [/[\/\\](?:core-js|\@babel|tslib|web-animations-js)[\/\\]/, /(ngfactory|ngstyle)\.js$/],
           use: [
-            ...(wco.supportES2015
-              ? []
-              : [
-                  {
-                    loader: require.resolve('babel-loader'),
-                    options: {
-                      babelrc: false,
-                      configFile: false,
-                      compact: false,
-                      cacheCompression: false,
-                      cacheDirectory: findCachePath('babel-webpack'),
-                      cacheIdentifier: JSON.stringify({
-                        buildAngular: require('../../../package.json').version,
-                      }),
-                      sourceType: 'unambiguous',
-                      presets: [
-                        [
-                          require.resolve('@babel/preset-env'),
-                          {
-                            bugfixes: true,
-                            modules: false,
-                            // Comparable behavior to tsconfig target of ES5
-                            targets: { ie: 9 },
-                            exclude: ['transform-typeof-symbol'],
-                          },
-                        ],
-                      ],
-                      plugins: [
-                        [
-                          require('@babel/plugin-transform-runtime').default,
-                          {
-                            useESModules: true,
-                            version: require('@babel/runtime/package.json').version,
-                            absoluteRuntime: path.dirname(
-                              require.resolve('@babel/runtime/package.json'),
-                            ),
-                          },
-                        ],
-                      ],
-                    },
-                  },
-                ]),
+            {
+              loader: require.resolve('../../babel/webpack-loader'),
+              options: {
+                cacheDirectory: findCachePath('babel-webpack'),
+                scriptTarget: wco.scriptTarget,
+              },
+            },
             ...buildOptimizerUseRule,
           ],
         },
@@ -581,8 +576,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       ...withWebpackFourOrFive({}, buildOptions.namedChunks ? { chunkIds: 'named' } : {}),
       ...withWebpackFourOrFive({ noEmitOnErrors: true }, { emitOnErrors: false }),
     },
-    // TODO_WEBPACK_5: Investigate non-working cache in development builds
-    ...withWebpackFourOrFive({}, { cache: false }),
     plugins: [
       // Always replace the context for the System.import in angular/core to prevent warnings.
       // https://github.com/angular/angular/issues/11580
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts b/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts
new file mode 100644
index 000000000000..6daa8a274940
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts
@@ -0,0 +1,240 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { existsSync, readFileSync } from 'fs';
+import { posix, resolve } from 'path';
+import * as url from 'url';
+import * as webpack from 'webpack';
+import { Configuration } from 'webpack-dev-server';
+import { normalizeOptimization } from '../../utils';
+import { WebpackConfigOptions, WebpackDevServerOptions } from '../../utils/build-options';
+import { getIndexOutputFile } from '../../utils/webpack-browser-config';
+import { HmrLoader } from '../plugins/hmr/hmr-loader';
+import { getWatchOptions } from '../utils/helpers';
+
+export function getDevServerConfig(
+  wco: WebpackConfigOptions<WebpackDevServerOptions>,
+): webpack.Configuration {
+  const {
+    buildOptions: {
+      optimization,
+      host,
+      port,
+      index,
+      headers,
+      poll,
+      ssl,
+      hmr,
+      main,
+      disableHostCheck,
+      liveReload,
+      allowedHosts,
+      watch,
+      proxyConfig,
+    },
+    logger,
+    root,
+  } = wco;
+
+  const servePath = buildServePath(wco.buildOptions, logger);
+  const { styles: stylesOptimization, scripts: scriptsOptimization } = normalizeOptimization(optimization);
+
+  const extraPlugins = [];
+
+  // Resolve public host and client address.
+  let publicHost = wco.buildOptions.publicHost;
+  if (publicHost) {
+    if (!/^\w+:\/\//.test(publicHost)) {
+      publicHost = `${ssl ? 'https' : 'http'}://${publicHost}`;
+    }
+
+    const parsedHost = url.parse(publicHost);
+    publicHost = parsedHost.host;
+  } else {
+    publicHost = '0.0.0.0:0';
+  }
+
+  if (!watch) {
+    // There's no option to turn off file watching in webpack-dev-server, but
+    // we can override the file watcher instead.
+    extraPlugins.push({
+      // tslint:disable-next-line:no-any
+      apply: (compiler: any) => {
+        compiler.hooks.afterEnvironment.tap('angular-cli', () => {
+          compiler.watchFileSystem = { watch: () => { } };
+        });
+      },
+    });
+  }
+
+  const extraRules: webpack.RuleSetRule[] = [];
+  if (hmr) {
+    extraRules.push({
+      loader: HmrLoader,
+      include: [main].map(p => resolve(wco.root, p)),
+    });
+  }
+
+  return {
+    plugins: extraPlugins,
+    module: {
+      rules: extraRules,
+    },
+    devServer: {
+      host,
+      port,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        ...headers,
+      },
+      historyApiFallback: !!index && {
+        index: `${servePath}/${getIndexOutputFile(index)}`,
+        disableDotRule: true,
+        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+        rewrites: [
+          {
+            from: new RegExp(`^(?!${servePath})/.*`),
+            to: context => url.format(context.parsedUrl),
+          },
+        ],
+      },
+      sockPath: posix.join(servePath, 'sockjs-node'),
+      stats: false,
+      compress: stylesOptimization.minify || scriptsOptimization,
+      watchOptions: getWatchOptions(poll),
+      https: getSslConfig(root, wco.buildOptions),
+      overlay: {
+        errors: !(stylesOptimization.minify || scriptsOptimization),
+        warnings: false,
+      },
+      public: publicHost,
+      allowedHosts,
+      disableHostCheck,
+      // This should always be true, but at the moment this breaks 'SuppressExtractedTextChunksWebpackPlugin'
+      // because it will include addition JS in the styles.js.
+      inline: hmr,
+      publicPath: servePath,
+      liveReload,
+      hotOnly: hmr && !liveReload,
+      hot: hmr,
+      proxy: addProxyConfig(root, proxyConfig),
+      contentBase: false,
+      logLevel: 'error',
+    } as Configuration & { logLevel: Configuration['clientLogLevel'] },
+  };
+}
+
+
+/**
+ * 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.
+ */
+export function buildServePath(
+  options: WebpackDevServerOptions,
+  logger: logging.LoggerApi,
+): string {
+  let servePath = options.servePath;
+  if (servePath === undefined) {
+    const defaultPath = findDefaultServePath(options.baseHref, options.deployUrl);
+    if (defaultPath == null) {
+      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 SSL configuration.
+ * @private
+ */
+function getSslConfig(
+  root: string,
+  options: WebpackDevServerOptions,
+) {
+  const { ssl, sslCert, sslKey } = options;
+  if (ssl && sslCert && sslKey) {
+    return {
+      key: readFileSync(resolve(root, sslKey), 'utf-8'),
+      cert: readFileSync(resolve(root, sslCert), 'utf-8'),
+    };
+  }
+
+  return ssl;
+}
+
+/**
+ * Private method to enhance a webpack config with Proxy configuration.
+ * @private
+ */
+function addProxyConfig(
+  root: string,
+  proxyConfig: string | undefined,
+) {
+  if (!proxyConfig) {
+    return undefined;
+  }
+
+  const proxyPath = resolve(root, proxyConfig);
+  if (existsSync(proxyPath)) {
+    return require(proxyPath);
+  }
+
+  throw new Error('Proxy config file ' + proxyPath + ' does not exist.');
+}
+
+/**
+ * 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 || ''}`;
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/index.ts b/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
index a6994d4857fc..1a861884a64d 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
@@ -1,16 +1,16 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 './browser';
 export * from './common';
+export * from './dev-server';
 export * from './server';
 export * from './styles';
 export * from './test';
 export * from './typescript';
-export * from '../utils/helpers';
 export * from './stats';
 export * from './worker';
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/server.ts b/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
index bbbfa72f04e2..1ba160f917e2 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -28,9 +28,9 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
   } = wco.buildOptions;
 
   const extraPlugins = [];
-  const { scripts, styles, hidden, vendor } = sourceMap;
+  const { scripts, styles, hidden } = sourceMap;
   if (scripts || styles) {
-    extraPlugins.push(getSourceMapDevTool(scripts, styles, hidden, false, vendor));
+    extraPlugins.push(getSourceMapDevTool(scripts, styles, hidden));
   }
 
   const externals: Configuration['externals'] = [...externalDependencies];
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/stats.ts b/packages/angular_devkit/build_angular/src/webpack/configs/stats.ts
index 7803c0b74d62..5c68382f1aee 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/stats.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/stats.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,10 +10,12 @@ import { WebpackConfigOptions } from '../../utils/build-options';
 import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
 
 const webpackOutputOptions = {
+  all: false, // Fallback value for stats options when an option is not defined. It has precedence over local webpack defaults.
   colors: true,
   hash: true, // required by custom stat output
   timings: true, // required by custom stat output
   chunks: true, // required by custom stat output
+  builtAt: true, // required by custom stat output
   chunkModules: false,
   children: false, // listing all children is very noisy in AOT and hides warnings/errors
   modules: false,
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
index 002c7ecb699b..6f70d3e4ec2a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -17,7 +17,7 @@ import {
   RemoveHashPlugin,
   SuppressExtractedTextChunksWebpackPlugin,
 } from '../plugins';
-import { getOutputHashFormat, normalizeExtraEntryPoints } from '../utils/helpers';
+import { assetNameTemplateFactory, getOutputHashFormat, normalizeExtraEntryPoints } from '../utils/helpers';
 
 // tslint:disable-next-line:no-big-function
 export function getStylesConfig(wco: WebpackConfigOptions) {
@@ -51,6 +51,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
           resolvedPath = require.resolve(style.input, { paths: [root] });
         } catch {}
       }
+
+      if (!buildOptions.preserveSymlinks) {
+        resolvedPath = fs.realpathSync(resolvedPath);
+      }
+
       // Add style entry points.
       if (entryPoints[style.bundleName]) {
         entryPoints[style.bundleName].push(resolvedPath);
@@ -121,8 +126,10 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         {
           loader: require.resolve('less-loader'),
           options: {
+            implementation: require('less'),
             sourceMap: cssSourceMap,
             lessOptions: {
+              math: 'always',
               javascriptEnabled: true,
               paths: includePaths,
             },
@@ -133,17 +140,10 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     {
       test: /\.styl$/,
       use: [
-        {
-          loader: require.resolve('resolve-url-loader'),
-          options: {
-            sourceMap: cssSourceMap,
-          },
-        },
         {
           loader: require.resolve('stylus-loader'),
           options: {
             sourceMap: cssSourceMap,
-            webpackImporter: false,
             stylusOptions: {
               compress: false,
               sourceMap: { comment: false },
@@ -155,6 +155,44 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     },
   ];
 
+  const assetNameTemplate = assetNameTemplateFactory(hashFormat);
+
+  const extraPostcssPlugins: import('postcss').Plugin[] = [];
+
+  // Attempt to setup Tailwind CSS
+  // A configuration file can exist in the project or workspace root
+  const tailwindConfigFile = 'tailwind.config.js';
+  let tailwindConfigPath;
+  for (const basePath of [wco.projectRoot, wco.root]) {
+    const fullPath = path.join(basePath, tailwindConfigFile);
+    if (fs.existsSync(fullPath)) {
+      tailwindConfigPath = fullPath;
+      break;
+    }
+  }
+  // Only load Tailwind CSS plugin if configuration file was found.
+  // This acts as a guard to ensure the project actually wants to use Tailwind CSS.
+  // The package may be unknowningly present due to a third-party transitive package dependency.
+  if (tailwindConfigPath) {
+    let tailwindPackagePath;
+    try {
+      tailwindPackagePath = require.resolve('tailwindcss', { paths: [wco.root] });
+    } catch {
+      const relativeTailwindConfigPath = path.relative(wco.root, tailwindConfigPath);
+      wco.logger.warn(
+        `Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
+          ` but the 'tailwindcss' package is not installed.` +
+          ` To enable Tailwind CSS, please install the 'tailwindcss' package.`,
+      );
+    }
+    if (tailwindPackagePath) {
+      if (process.env['TAILWIND_MODE'] === undefined) {
+        process.env['TAILWIND_MODE'] = buildOptions.watch ? 'watch' : 'build';
+      }
+      extraPostcssPlugins.push(require(tailwindPackagePath)({ config: tailwindConfigPath }));
+    }
+  }
+
   const postcssOptionsCreator = (sourceMap: boolean, extracted: boolean | undefined) => {
     return (loader: webpack.loader.LoaderContext) => ({
       map: sourceMap && {
@@ -184,11 +222,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
           deployUrl: buildOptions.deployUrl,
           resourcesOutputPath: buildOptions.resourcesOutputPath,
           loader,
-          rebaseRootRelative: buildOptions.rebaseRootRelativeCssUrls,
-          filename: `[name]${hashFormat.file}.[ext]`,
+          filename: assetNameTemplate,
           emitFile: buildOptions.platform !== 'server',
           extracted,
         }),
+        ...extraPostcssPlugins,
         autoprefixer(),
       ],
     });
@@ -199,7 +237,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     cssSourceMap
     // Never use component css sourcemap when style optimizations are on.
     // It will just increase bundle size without offering good debug experience.
-    && !buildOptions.optimization.styles
+    && !buildOptions.optimization.styles.minify
     // Inline all sourcemap types except hidden ones, which are the same as no sourcemaps
     // for component css.
     && !buildOptions.sourceMap.hidden
@@ -213,6 +251,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       {
         loader: require.resolve('postcss-loader'),
         options: {
+          implementation: require('postcss'),
           postcssOptions: postcssOptionsCreator(componentsSourceMap, false),
         },
       },
@@ -222,9 +261,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // load global css as css files
   if (globalStylePaths.length > 0) {
-    const globalSourceMap = !!(
-      cssSourceMap && !buildOptions.extractCss && !buildOptions.sourceMap.hidden
-    );
+    const globalSourceMap = !!cssSourceMap && !buildOptions.sourceMap.hidden;
 
     rules.push(
       ...baseRules.map(({ test, use }) => {
@@ -247,6 +284,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
             {
               loader: require.resolve('postcss-loader'),
               options: {
+                implementation: require('postcss'),
                 postcssOptions: postcssOptionsCreator(globalSourceMap, buildOptions.extractCss),
               },
             },
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/test.ts b/packages/angular_devkit/build_angular/src/webpack/configs/test.ts
index 881012f4ce52..47fd29ec2e7a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/test.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -48,18 +48,13 @@ export function getTestConfig(
     });
   }
 
-  if (sourceMap) {
-    const { styles, scripts, vendor } = sourceMap;
-
-    if (styles || scripts) {
-      extraPlugins.push(getSourceMapDevTool(
-        scripts,
-        styles,
-        false,
-        true,
-        vendor,
-      ));
-    }
+  if (sourceMap.scripts || sourceMap.styles) {
+    extraPlugins.push(getSourceMapDevTool(
+      sourceMap.scripts,
+      sourceMap.styles,
+      false,
+      true,
+    ));
   }
 
   return {
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts b/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts
index 6e854baf8130..3eca8df74416 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts
@@ -1,21 +1,89 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { CompilerOptions } from '@angular/compiler-cli';
 import { buildOptimizerLoaderPath } from '@angular-devkit/build-optimizer';
-import * as path from 'path';
+import { getSystemPath } from '@angular-devkit/core';
 import {
   AngularCompilerPlugin,
   AngularCompilerPluginOptions,
   NgToolsLoader,
-  PLATFORM
+  PLATFORM,
+  ivy,
 } from '@ngtools/webpack';
+import * as path from 'path';
+import { RuleSetLoader } from 'webpack';
 import { WebpackConfigOptions, BuildOptions } from '../../utils/build-options';
+import { legacyIvyPluginEnabled } from '../../utils/environment-options';
+
+function canUseIvyPlugin(wco: WebpackConfigOptions): boolean {
+  // Can only be used with Ivy
+  if (!wco.tsConfig.options.enableIvy) {
+    return false;
+  }
+
+  // Allow fallback to legacy build system via environment variable ('NG_BUILD_IVY_LEGACY=1')
+  if (legacyIvyPluginEnabled) {
+    wco.logger.warn(
+      '"NG_BUILD_IVY_LEGACY" environment variable detected. Using legacy Ivy build system.',
+    );
+
+    return false;
+  }
+
+  // Lazy modules option uses the deprecated string format for lazy routes
+  if (wco.buildOptions.lazyModules && wco.buildOptions.lazyModules.length > 0) {
+    return false;
+  }
+
+  // This pass relies on internals of the original plugin
+  if (wco.buildOptions.experimentalRollupPass) {
+    return false;
+  }
+
+  return true;
+}
+
+function createIvyPlugin(
+  wco: WebpackConfigOptions,
+  aot: boolean,
+  tsconfig: string,
+): ivy.AngularWebpackPlugin {
+  const { buildOptions } = wco;
+  const optimize = buildOptions.optimization.scripts;
+
+  const compilerOptions: CompilerOptions = {
+    sourceMap: buildOptions.sourceMap.scripts,
+    declaration: false,
+    declarationMap: false,
+  };
+
+  if (buildOptions.preserveSymlinks !== undefined) {
+    compilerOptions.preserveSymlinks = buildOptions.preserveSymlinks;
+  }
+
+  const fileReplacements: Record<string, string> = {};
+  if (buildOptions.fileReplacements) {
+    for (const replacement of buildOptions.fileReplacements) {
+      fileReplacements[getSystemPath(replacement.replace)] = getSystemPath(replacement.with);
+    }
+  }
+
+  return new ivy.AngularWebpackPlugin({
+    tsconfig,
+    compilerOptions,
+    fileReplacements,
+    jitMode: !aot,
+    emitNgModuleScope: !optimize,
+    suppressZoneJsIncompatibilityWarning: true,
+  });
+}
 
 function _pluginOptionsOverrides(
   buildOptions: BuildOptions,
@@ -94,6 +162,7 @@ function _createAotPlugin(
     directTemplateLoading: true,
     ...options,
     compilerOptions,
+    suppressZoneJsIncompatibilityWarning: true,
   };
 
   pluginOptions = _pluginOptionsOverrides(buildOptions, pluginOptions);
@@ -103,40 +172,78 @@ function _createAotPlugin(
 
 export function getNonAotConfig(wco: WebpackConfigOptions) {
   const { tsConfigPath } = wco;
+  const useIvyOnlyPlugin = canUseIvyPlugin(wco);
 
   return {
-    module: { rules: [{ test: /\.tsx?$/, loader: NgToolsLoader }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true })]
+    module: {
+      rules: [
+        {
+          test: useIvyOnlyPlugin ? /\.[jt]sx?$/ : /\.tsx?$/,
+          loader: useIvyOnlyPlugin
+            ? ivy.AngularWebpackLoaderPath
+            : NgToolsLoader,
+        },
+      ],
+    },
+    plugins: [
+      useIvyOnlyPlugin
+        ? createIvyPlugin(wco, false, tsConfigPath)
+        : _createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true }),
+    ],
   };
 }
 
 export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
   const { tsConfigPath, buildOptions } = wco;
+  const optimize = buildOptions.optimization.scripts;
+  const useIvyOnlyPlugin = canUseIvyPlugin(wco) && !i18nExtract;
 
-  const loaders: any[] = [NgToolsLoader];
+  let buildOptimizerRules: RuleSetLoader[] = [];
   if (buildOptions.buildOptimizer) {
-    loaders.unshift({
+    buildOptimizerRules = [{
       loader: buildOptimizerLoaderPath,
       options: { sourceMap: buildOptions.sourceMap.scripts }
-    });
+    }];
   }
 
-  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.tsx?)$/;
-  const optimize = wco.buildOptions.optimization.scripts;
-
   return {
-    module: { rules: [{ test, use: loaders }] },
+    module: {
+      rules: [
+        {
+          test: useIvyOnlyPlugin ? /\.tsx?$/ : /(?:\.ngfactory\.js|\.ngstyle\.js|\.tsx?)$/,
+          use: [
+            ...buildOptimizerRules,
+            useIvyOnlyPlugin ? ivy.AngularWebpackLoaderPath : NgToolsLoader,
+          ],
+        },
+        // "allowJs" support with ivy plugin - ensures build optimizer is not run twice
+        ...(useIvyOnlyPlugin
+          ? [
+              {
+                test: /\.jsx?$/,
+                use: [ivy.AngularWebpackLoaderPath],
+              },
+            ]
+          : []),
+      ],
+    },
     plugins: [
-      _createAotPlugin(
-        wco,
-        { tsConfigPath, emitClassMetadata: !optimize, emitNgModuleScope: !optimize },
-        i18nExtract,
-      ),
+      useIvyOnlyPlugin
+        ? createIvyPlugin(wco, true, tsConfigPath)
+        : _createAotPlugin(
+            wco,
+            { tsConfigPath, emitClassMetadata: !optimize, emitNgModuleScope: !optimize },
+            i18nExtract,
+          ),
     ],
   };
 }
 
 export function getTypescriptWorkerPlugin(wco: WebpackConfigOptions, workerTsConfigPath: string) {
+  if (canUseIvyPlugin(wco)) {
+    return createIvyPlugin(wco, false, workerTsConfigPath);
+  }
+
   const { buildOptions } = wco;
 
   let pluginOptions: AngularCompilerPluginOptions = {
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/worker.ts b/packages/angular_devkit/build_angular/src/webpack/configs/worker.ts
index 318f1ac09df0..e707eb49b4b2 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/worker.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/worker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -22,12 +22,27 @@ export function getWorkerConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   const workerTsConfigPath = resolve(wco.root, buildOptions.webWorkerTsConfig);
-  const WorkerPlugin = require('worker-plugin');
+  const WebWorkerPlugin = require('worker-plugin');
+
+  const workerPlugins = [getTypescriptWorkerPlugin(wco, workerTsConfigPath)];
+  if (buildOptions.extractLicenses) {
+    // Webpack child compilations will not inherit the license plugin
+    const LicenseWebpackPlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
+    workerPlugins.push(new LicenseWebpackPlugin({
+      stats: {
+        warnings: false,
+        errors: false,
+      },
+      perChunkOutput: false,
+      // The name needs to be unique to this child compilation to avoid duplicate asset errors
+      outputFilename: '3rdpartylicenses-worker-[hash].txt',
+    }));
+  }
 
   return {
-    plugins: [new WorkerPlugin({
+    plugins: [new WebWorkerPlugin({
       globalObject: false,
-      plugins: [getTypescriptWorkerPlugin(wco, workerTsConfigPath)],
+      plugins: workerPlugins,
     })],
   };
 }
diff --git a/packages/angular_devkit/build_angular/src/webpack/es5-jit-polyfills.js b/packages/angular_devkit/build_angular/src/webpack/es5-jit-polyfills.js
index febcbb5329c9..f71bda480e05 100644
--- a/packages/angular_devkit/build_angular/src/webpack/es5-jit-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/webpack/es5-jit-polyfills.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js b/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js
index 9477b86544e7..822576c69e7a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -32,6 +32,10 @@ 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';
+import 'core-js/modules/es.object.entries';
+import 'core-js/modules/es.object.values';
+import 'core-js/modules/es.object.get-own-property-descriptors';
+import 'core-js/modules/es.object.from-entries';
 
 // ES2015 array capabilities
 import 'core-js/modules/es.array.concat';
@@ -56,6 +60,9 @@ 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';
+import 'core-js/modules/es.array.includes';
+import 'core-js/modules/es.array.flat';
+import 'core-js/modules/es.array.flat-map';
 
 // ES2015 string capabilities
 import 'core-js/modules/es.string.from-code-point';
@@ -104,4 +111,4 @@ import 'core-js/modules/web.dom-collections.iterator';
 import 'core-js/modules/es.promise';
 import 'core-js/modules/es.json.to-string-tag';
 
-import 'regenerator-runtime/runtime';
\ No newline at end of file
+import 'regenerator-runtime/runtime';
diff --git a/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js b/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js
index b57ee9bd423a..13b61e7b2f44 100644
--- a/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts
index fc7f0c4ffe3c..587812c2b142 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -196,16 +196,17 @@ export class NgBuildAnalyticsPlugin {
     }
   }
 
-  // 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
+  protected _collectBundleStats(compilation: compilation.Compilation) {
+    // `compilation.chunks` is a Set in Webpack 5
+    const chunks = Array.from(compilation.chunks);
+
+    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;
+      .forEach((chunk: { files: string[]; canBeInitial(): boolean }) => {
+        const asset = compilation.assets[chunk.files[0]];
+        const size = asset ? asset.size() : 0;
 
-        if (chunk.entry || chunk.initial) {
+        if (chunk.canBeInitial()) {
           this._stats.initialChunkSize += size;
         } else {
           this._stats.lazyChunkCount++;
@@ -215,24 +216,26 @@ export class NgBuildAnalyticsPlugin {
         this._stats.totalChunkSize += size;
       });
 
-    json.assets
+    Object.entries<{ size(): number }>(compilation.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);
+      .filter(([name]) => {
+        return chunks.every((chunk: { files: string[] }) => chunk.files[0] != name);
       })
-      .forEach((a: { size?: number }) => {
-        this._stats.assetSize += (a.size || 0);
+      .forEach(([, asset]) => {
+        this._stats.assetSize += asset.size();
         this._stats.assetCount++;
       });
 
-    for (const asset of json.assets) {
-      if (asset.name == 'polyfill') {
-        this._stats.polyfillSize += asset.size || 0;
+    for (const [name, asset] of Object.entries<{ size(): number }>(compilation.assets)) {
+      if (name == 'polyfill') {
+        this._stats.polyfillSize += asset.size();
       }
     }
-    for (const chunk of json.chunks) {
+    for (const chunk of compilation.chunks) {
       if (chunk.files[0] && chunk.files[0].endsWith('.css')) {
-        this._stats.cssSize += chunk.size || 0;
+        const asset = compilation.assets[chunk.files[0]];
+        const size = asset ? asset.size() : 0;
+        this._stats.cssSize += size;
       }
     }
   }
@@ -276,7 +279,7 @@ export class NgBuildAnalyticsPlugin {
 
   protected _done(stats: Stats) {
     this._collectErrors(stats);
-    this._collectBundleStats(stats.toJson());
+    this._collectBundleStats(stats.compilation);
     if (this._built) {
       this._reportRebuildMetrics(stats);
     } else {
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics_spec.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics_spec.ts
index e0266f68bdee..456fc9011544 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics_spec.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/any-component-style-budget-checker.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/any-component-style-budget-checker.ts
index 8704f2b19b8c..dc5780056e24 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/any-component-style-budget-checker.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/any-component-style-budget-checker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/builder-watch-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/builder-watch-plugin.ts
new file mode 100644
index 000000000000..a5de101e3a15
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/builder-watch-plugin.ts
@@ -0,0 +1,192 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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';
+import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
+
+export type BuilderWatcherCallback = (
+  events: Array<{ path: string; type: 'created' | 'modified' | 'deleted'; time?: number }>,
+) => void;
+
+export interface BuilderWatcherFactory {
+  watch(
+    files: Iterable<string>,
+    directories: Iterable<string>,
+    callback: BuilderWatcherCallback,
+  ): { close(): void };
+}
+
+export interface WebpackWatcher {
+  close(): void;
+  pause(): void;
+  // Webpack 4
+  getFileTimestamps(): Map<string, number>;
+  getContextTimestamps(): Map<string, number>;
+  // Webpack 5
+  getFileTimeInfoEntries(): Map<string, { safeTime: number; timestamp: number }>;
+  getContextTimeInfoEntries(): Map<string, { safeTime: number; timestamp: number }>;
+}
+
+class TimeInfoMap extends Map<string, { safeTime: number; timestamp: number }> {
+  update(path: string, timestamp: number): void {
+    this.set(path, Object.freeze({ safeTime: timestamp, timestamp }));
+  }
+
+  toTimestamps(): Map<string, number> {
+    const timestamps = new Map<string, number>();
+    for (const [file, entry] of this) {
+      timestamps.set(file, entry.timestamp);
+    }
+
+    return timestamps;
+  }
+}
+
+type WatchCallback4 = (
+  error: Error | undefined,
+  fileChanges: Set<string>,
+  directoryChanges: Set<string>,
+  missingChanges: Set<string>,
+  files: Map<string, number>,
+  contexts: Map<string, number>,
+  removals: Set<string>,
+) => void;
+type WatchCallback5 = (
+  error: Error | undefined,
+  files: Map<string, { safeTime: number; timestamp: number }>,
+  contexts: Map<string, { safeTime: number; timestamp: number }>,
+  changes: Set<string>,
+  removals: Set<string>,
+) => void;
+
+export interface WebpackWatchFileSystem {
+  watch(
+    files: Iterable<string>,
+    directories: Iterable<string>,
+    missing: Iterable<string>,
+    startTime: number,
+    options: {},
+    callback: WatchCallback4 | WatchCallback5,
+    callbackUndelayed: (file: string, time: number) => void,
+  ): WebpackWatcher;
+}
+
+class BuilderWatchFileSystem implements WebpackWatchFileSystem {
+  constructor(
+    private readonly watcherFactory: BuilderWatcherFactory,
+    private readonly inputFileSystem: { purge?(path?: string): void },
+  ) {}
+
+  watch(
+    files: Iterable<string>,
+    directories: Iterable<string>,
+    missing: Iterable<string>,
+    startTime: number,
+    _options: {},
+    callback: WatchCallback4 | WatchCallback5,
+    callbackUndelayed?: (file: string, time: number) => void,
+  ): WebpackWatcher {
+    const watchedFiles = new Set(files);
+    const watchedDirectories = new Set(directories);
+    const watchedMissing = new Set(missing);
+
+    const timeInfo = new TimeInfoMap();
+    for (const file of files) {
+      timeInfo.update(file, startTime);
+    }
+    for (const directory of directories) {
+      timeInfo.update(directory, startTime);
+    }
+
+    const watcher = this.watcherFactory.watch(files, directories, (events) => {
+      if (events.length === 0) {
+        return;
+      }
+
+      if (callbackUndelayed) {
+        process.nextTick(() => callbackUndelayed(events[0].path, events[0].time ?? Date.now()));
+      }
+
+      process.nextTick(() => {
+        const removals = new Set<string>();
+        const fileChanges = new Set<string>();
+        const directoryChanges = new Set<string>();
+        const missingChanges = new Set<string>();
+
+        for (const event of events) {
+          this.inputFileSystem.purge?.(event.path);
+
+          if (event.type === 'deleted') {
+            timeInfo.delete(event.path);
+            removals.add(event.path);
+          } else {
+            timeInfo.update(event.path, event.time ?? Date.now());
+            if (watchedFiles.has(event.path)) {
+              fileChanges.add(event.path);
+            } else if (watchedDirectories.has(event.path)) {
+              directoryChanges.add(event.path);
+            } else if (watchedMissing.has(event.path)) {
+              missingChanges.add(event.path);
+            }
+          }
+        }
+
+        if (isWebpackFiveOrHigher()) {
+          (callback as WatchCallback5)(
+            undefined,
+            new Map(timeInfo),
+            new Map(timeInfo),
+            new Set([...fileChanges, ...directoryChanges, ...missingChanges]),
+            removals,
+          );
+        } else {
+          (callback as WatchCallback4)(
+            undefined,
+            fileChanges,
+            directoryChanges,
+            missingChanges,
+            timeInfo.toTimestamps(),
+            timeInfo.toTimestamps(),
+            removals,
+          );
+        }
+      });
+    });
+
+    return {
+      close() {
+        watcher.close();
+      },
+      pause() {},
+      getFileTimestamps() {
+        return timeInfo.toTimestamps();
+      },
+      getContextTimestamps() {
+        return timeInfo.toTimestamps();
+      },
+      getFileTimeInfoEntries() {
+        return new Map(timeInfo);
+      },
+      getContextTimeInfoEntries() {
+        return new Map(timeInfo);
+      },
+    };
+  }
+}
+
+export class BuilderWatchPlugin {
+  constructor(private readonly watcherFactory: BuilderWatcherFactory) {}
+
+  apply(compiler: Compiler & { watchFileSystem: WebpackWatchFileSystem }): void {
+    compiler.hooks.environment.tap('BuilderWatchPlugin', () => {
+      compiler.watchFileSystem = new BuilderWatchFileSystem(
+        this.watcherFactory,
+        compiler.inputFileSystem,
+      );
+    });
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts
deleted file mode 100644
index 260e304ddb93..000000000000
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.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 { Compiler } from 'webpack';
-import { Budget } from '../../browser/schema';
-import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator';
-import { ProcessBundleResult } from '../../utils/process-bundle';
-import { addError, addWarning } from '../../utils/webpack-diagnostics';
-
-export interface BundleBudgetPluginOptions {
-  budgets: Budget[];
-}
-
-export class BundleBudgetPlugin {
-  constructor(private options: BundleBudgetPluginOptions) { }
-
-  apply(compiler: Compiler): void {
-    const { budgets } = this.options;
-
-    if (!budgets || budgets.length === 0) {
-      return;
-    }
-
-    compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation) => {
-      // No process bundle results because this plugin is only used when differential
-      // builds are disabled.
-      const processResults: ProcessBundleResult[] = [];
-
-      const stats = compilation.getStats().toJson();
-      for (const { severity, message } of checkBudgets(budgets, stats, processResults)) {
-        switch (severity) {
-          case ThresholdSeverity.Warning:
-            addWarning(compilation, `budgets: ${message}`);
-            break;
-          case ThresholdSeverity.Error:
-            addError(compilation, `budgets: ${message}`);
-            break;
-        }
-      }
-    });
-  }
-}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/common-js-usage-warn-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/common-js-usage-warn-plugin.ts
index daa3ba386c2c..20b59d1c9c47 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/common-js-usage-warn-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/common-js-usage-warn-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -33,17 +33,10 @@ export interface CommonJsUsageWarnPluginOptions {
 
 export class CommonJsUsageWarnPlugin {
   private shownWarnings = new Set<string>();
-
-  // Allow the below dependency for HMR
-  // tslint:disable-next-line: max-line-length
-  // https://github.com/angular/angular-cli/blob/1e258317b1f6ec1e957ee3559cc3b28ba602f3ba/packages/angular_devkit/build_angular/src/dev-server/index.ts#L605-L638
-  private allowedDependencies = new Set<string>([
-    'webpack/hot/dev-server',
-    '@angular-devkit/build-angular',
-  ]);
+  private allowedDependencies: Set<string>;
 
   constructor(private options: CommonJsUsageWarnPluginOptions = {}) {
-    this.options.allowedDependencies?.forEach(d => this.allowedDependencies.add(d));
+    this.allowedDependencies = new Set(this.options.allowedDependencies);
   }
 
   apply(compiler: Compiler) {
@@ -89,7 +82,7 @@ export class CommonJsUsageWarnPlugin {
             // Only show warnings for modules from main entrypoint.
             // And if the issuer request is not from 'webpack-dev-server', as 'webpack-dev-server'
             // will require CommonJS libraries for live reloading such as 'sockjs-node'.
-            if (mainIssuer?.name === 'main' && !issuer?.userRequest?.includes('webpack-dev-server')) {
+            if (mainIssuer?.name === 'main') {
               const warning = `${issuer?.userRequest} depends on '${rawRequest}'. ` +
                 'CommonJS or AMD dependencies can cause optimization bailouts.\n' +
                 'For more info see: https://angular.io/guide/build#configuring-commonjs-dependencies';
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/dedupe-module-resolve-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/dedupe-module-resolve-plugin.ts
index 69614324ca5f..55832b2f4779 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/dedupe-module-resolve-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/dedupe-module-resolve-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-accept.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-accept.ts
index 6288fdf6399b..6e69748a13f7 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-accept.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-accept.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { ApplicationRef, PlatformRef, Type, ɵresetCompiledComponents } from '@angular/core';
+import { ApplicationRef, PlatformRef, Type, isDevMode, ɵresetCompiledComponents } from '@angular/core';
 import { filter, take } from 'rxjs/operators';
 
 // For the time being we cannot use the DOM lib because it conflicts with @types/node,
@@ -27,6 +27,12 @@ export default function (mod: any): void {
     return;
   }
 
+  if (!isDevMode()) {
+    console.error(`[NG HMR] Cannot use HMR when Angular is running in production mode. To prevent production mode, do not call 'enableProdMode()'.`);
+
+    return;
+  }
+
   mod['hot'].accept();
   mod['hot'].dispose(() => {
     if (typeof ng === 'undefined') {
@@ -52,7 +58,8 @@ export default function (mod: any): void {
       return;
     }
 
-    const oldInputs = document.querySelectorAll('input, textarea');
+    // Inputs that are hidden should be ignored
+    const oldInputs = document.querySelectorAll('input:not([type="hidden"]), textarea');
     const oldOptions = document.querySelectorAll('option');
 
     // Create new application
@@ -160,8 +167,8 @@ function dispatchEvents(element: any): void {
 }
 
 function restoreFormValues(oldInputs: any[], oldOptions: any[]): void {
-  // Restore input
-  const newInputs = document.querySelectorAll('input, textarea');
+  // Restore input that are not hidden
+  const newInputs = document.querySelectorAll('input:not([type="hidden"]), textarea');
   if (newInputs.length && newInputs.length === oldInputs.length) {
     console.log('[NG HMR] Restoring input/textarea values.');
     for (let index = 0; index < newInputs.length; index++) {
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-loader.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-loader.ts
index f467fc4134f1..bea890e9c738 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-loader.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/hmr/hmr-loader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,7 +9,7 @@
 import { join } from 'path';
 
 export const HmrLoader = __filename;
-const hmrAcceptPath = join(__dirname, './hmr-accept.js');
+const hmrAcceptPath = join(__dirname, './hmr-accept.js').replace(/\\/g, '/');
 
 export default function (
   this: import('webpack').loader.LoaderContext,
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts
index 18a309831f4d..6b16dadad17a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts
@@ -1,121 +1,124 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { basename, dirname, extname } from 'path';
 import { Compiler, compilation } from 'webpack';
 import { RawSource } from 'webpack-sources';
-import {
-  CrossOriginValue,
-  FileInfo,
-  augmentIndexHtml,
-} from '../../utils/index-file/augment-index-html';
-import { IndexHtmlTransform } from '../../utils/index-file/write-index-html';
-import { stripBom } from '../../utils/strip-bom';
-
-export interface IndexHtmlWebpackPluginOptions {
-  input: string;
-  output: string;
-  baseHref?: string;
-  entrypoints: string[];
-  deployUrl?: string;
-  sri: boolean;
+import { FileInfo } from '../../utils/index-file/augment-index-html';
+import { IndexHtmlGenerator, IndexHtmlGeneratorOptions, IndexHtmlGeneratorProcessOptions } from '../../utils/index-file/index-html-generator';
+import { addError, addWarning } from '../../utils/webpack-diagnostics';
+import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
+
+export interface IndexHtmlWebpackPluginOptions extends IndexHtmlGeneratorOptions,
+  Omit<IndexHtmlGeneratorProcessOptions, 'files' | 'noModuleFiles' | 'moduleFiles'> {
   noModuleEntrypoints: string[];
   moduleEntrypoints: string[];
-  postTransforms: IndexHtmlTransform[];
-  crossOrigin?: CrossOriginValue;
-  lang?: string;
 }
 
-function readFile(filename: string, compilation: compilation.Compilation): Promise<string> {
-  return new Promise<string>((resolve, reject) => {
-    compilation.inputFileSystem.readFile(filename, (err: Error, data: Buffer) => {
-      if (err) {
-        reject(err);
-
-        return;
-      }
+const PLUGIN_NAME = 'index-html-webpack-plugin';
+export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {
+  private _compilation: compilation.Compilation | undefined;
+  get compilation(): compilation.Compilation {
+    if (this._compilation) {
+      return this._compilation;
+    }
 
-      resolve(stripBom(data.toString()));
-    });
-  });
-}
+    throw new Error('compilation is undefined.');
+  }
 
-export class IndexHtmlWebpackPlugin {
-  private _options: IndexHtmlWebpackPluginOptions;
-
-  constructor(options?: Partial<IndexHtmlWebpackPluginOptions>) {
-    this._options = {
-      input: 'index.html',
-      output: 'index.html',
-      entrypoints: ['polyfills', 'main'],
-      noModuleEntrypoints: [],
-      moduleEntrypoints: [],
-      sri: false,
-      postTransforms: [],
-      ...options,
-    };
+  constructor(readonly options: IndexHtmlWebpackPluginOptions) {
+    super(options);
   }
 
   apply(compiler: Compiler) {
-    compiler.hooks.emit.tapPromise('index-html-webpack-plugin', async compilation => {
-      // Get input html file
-      const inputContent = await readFile(this._options.input, compilation);
-      compilation.fileDependencies.add(this._options.input);
+    if (isWebpackFiveOrHigher()) {
+      compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+        this._compilation = compilation;
 
+        // webpack 5 migration "guide"
+        // https://github.com/webpack/webpack/blob/07fc554bef5930f8577f91c91a8b81791fc29746/lib/Compilation.js#L535-L539
+        // TODO_WEBPACK_5 const stage = Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE + 1;
+        // tslint:disable-next-line: no-any
+        (compilation.hooks as any).processAssets.tapPromise({ name: PLUGIN_NAME, stage: 101 }, callback);
+      });
+    } else {
+      compiler.hooks.emit.tapPromise(PLUGIN_NAME, async compilation => {
+        this._compilation = compilation;
+
+        await callback(compilation.assets);
+      });
+    }
+
+    const callback = async (assets: Record<string, unknown>) => {
       // 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 => ({
-            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);
+      try {
+        for (const [entryName, entrypoint] of this.compilation.entrypoints) {
+          const entryFiles: FileInfo[] = entrypoint?.getFiles()?.map(
+            (f: string): FileInfo => ({
+              name: entryName,
+              file: f,
+              extension: extname(f),
+            }),
+          );
+
+          if (!entryFiles) {
+            continue;
+          }
+
+          if (this.options.noModuleEntrypoints.includes(entryName)) {
+            noModuleFiles.push(...entryFiles);
+          } else if (this.options.moduleEntrypoints.includes(entryName)) {
+            moduleFiles.push(...entryFiles);
+          } else {
+            files.push(...entryFiles);
+          }
         }
-      }
 
-      const loadOutputFile = async (name: string) => {
-        const data = compilation.assets[name].source();
-
-        return typeof data === 'string' ? data : data.toString();
-      };
-
-      let indexSource = await augmentIndexHtml({
-        input: this._options.input,
-        inputContent,
-        baseHref: this._options.baseHref,
-        deployUrl: this._options.deployUrl,
-        sri: this._options.sri,
-        crossOrigin: this._options.crossOrigin,
-        files,
-        noModuleFiles,
-        loadOutputFile,
-        moduleFiles,
-        entrypoints: this._options.entrypoints,
-        lang: this._options.lang,
-      });
+        const { content, warnings, errors } = await this.process({
+          files,
+          noModuleFiles,
+          moduleFiles,
+          outputPath: dirname(this.options.outputPath),
+          baseHref: this.options.baseHref,
+          lang: this.options.lang,
+        });
+
+        assets[this.options.outputPath] = new RawSource(content);
 
-      for (const transform of this._options.postTransforms) {
-        indexSource = await transform(indexSource);
+        warnings.forEach(msg => addWarning(this.compilation, msg));
+        errors.forEach(msg => addError(this.compilation, msg));
+      } catch (error) {
+        addError(this.compilation, error.message);
       }
+    };
+  }
+
+  async readAsset(path: string): Promise<string> {
+    const data = this.compilation.assets[basename(path)].source();
 
-      // Add to compilation assets
-      compilation.assets[this._options.output] = new RawSource(indexSource);
+    return typeof data === 'string' ? data : data.toString();
+  }
+
+  protected async readIndex(path: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+      this.compilation.inputFileSystem.readFile(path, (err: Error, data: Buffer) => {
+        if (err) {
+          reject(err);
+
+          return;
+        }
+
+        this.compilation.fileDependencies.add(path);
+        resolve(data.toString());
+      });
     });
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts
index 5a745c4116df..b8d1f3002930 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,7 +9,6 @@
 // Exports the webpack plugins we use internally.
 export { AnyComponentStyleBudgetChecker } from './any-component-style-budget-checker';
 export { OptimizeCssWebpackPlugin, OptimizeCssWebpackPluginOptions } from './optimize-css-webpack-plugin';
-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';
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html
similarity index 100%
rename from packages/angular_devkit/build_angular/src/webpack/plugins/karma-context.html
rename to packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma-debug.html b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
similarity index 99%
rename from packages/angular_devkit/build_angular/src/webpack/plugins/karma-debug.html
rename to packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
index 8c3fe313059d..44dbff5898f4 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
@@ -9,6 +9,7 @@
 <head>
 %X_UA_COMPATIBLE%
   <title>Karma DEBUG RUNNER</title>
+  <base href="/">
   <link href="favicon.ico" rel="icon" type="image/x-icon" />
   <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" />
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma-webpack-failure-cb.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts
similarity index 94%
rename from packages/angular_devkit/build_angular/src/webpack/plugins/karma-webpack-failure-cb.ts
rename to packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts
index b4c02479bd6e..36733d5f0a71 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma-webpack-failure-cb.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
similarity index 78%
rename from packages/angular_devkit/build_angular/src/webpack/plugins/karma.ts
rename to packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
index b049408eda73..b892c13ec246 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
@@ -1,25 +1,25 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 http from 'http';
 import * as path from 'path';
 import * as glob from 'glob';
 import * as webpack from 'webpack';
 const webpackDevMiddleware = require('webpack-dev-middleware');
 
 import { KarmaWebpackFailureCb } from './karma-webpack-failure-cb';
-import { statsErrorsToString } from '../utils/stats';
-import { getWebpackStatsConfig } from '../configs/stats';
+import { statsErrorsToString } from '../../utils/stats';
+import { getWebpackStatsConfig } from '../../configs/stats';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import { logging } from '@angular-devkit/core';
-import { WebpackTestOptions } from '../../utils/build-options';
-import { normalizeSourceMaps } from '../../utils/index';
+import { WebpackTestOptions } from '../../../utils/build-options';
+import { normalizeSourceMaps } from '../../../utils/index';
 
 /**
  * Enumerate needed (but not require/imported) dependencies from this file
@@ -29,6 +29,8 @@ import { normalizeSourceMaps } from '../../utils/index';
  * require('karma-source-map-support')
  */
 
+ const KARMA_APPLICATION_PATH = '_karma_webpack_';
+
 
 let blocked: any[] = [];
 let isBlocked = false;
@@ -59,7 +61,7 @@ function addKarmaFiles(files: any[], newFiles: any[], prepend = false) {
   }
 }
 
-const init: any = (config: any, emitter: any, customFileHandlers: any) => {
+const init: any = (config: any, emitter: any) => {
   if (!config.buildWebpack) {
     throw new Error(`The '@angular-devkit/build-angular/plugins/karma' karma plugin is meant to` +
     ` be used from within Angular CLI and will not work correctly outside of it.`
@@ -93,20 +95,19 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     config.plugins = config.plugins || [];
     config.reporters = config.reporters || [];
     const {plugins, reporters} = config;
-    const hasCoveragePlugin = plugins.some((p: {}) => 'reporter:coverage' in p);
-    const hasIstanbulPlugin = plugins.some((p: {}) => 'reporter:coverage-istanbul' in p);
+    const hasCoveragePlugin = plugins.some(isPlugin('karma-coverage', 'reporter:coverage'));
+    const hasIstanbulPlugin = plugins.some(isPlugin('karma-coverage-istanbul-reporter', 'reporter:coverage-istanbul'));
     const hasCoverageReporter = reporters.includes('coverage');
     const hasIstanbulReporter = reporters.includes('coverage-istanbul');
     if (hasCoveragePlugin && !hasCoverageReporter) {
       reporters.push('coverage');
-    }
-    else if (hasIstanbulPlugin && !hasIstanbulReporter) {
+    } else if (hasIstanbulPlugin && !hasIstanbulReporter) {
       // coverage-istanbul is deprecated in favor of karma-coverage
       reporters.push('coverage-istanbul');
+    } else if (!hasCoveragePlugin && !hasIstanbulPlugin) {
+      throw new Error('karma-coverage must be installed in order to run code coverage.');
     }
-    else {
-      throw new Error('karma-coverage must be installed in order to run code coverage');
-    }
+
     if (hasIstanbulPlugin) {
       logger.warn(`'karma-coverage-istanbul-reporter' usage has been deprecated since version 11.\n` +
        `Please install 'karma-coverage' and update 'karma.conf.js.' ` +
@@ -120,8 +121,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     // Hide webpack output because its noisy.
     logLevel: 'error',
     stats: false,
-    watchOptions: { poll: options.poll },
-    publicPath: '/_karma_webpack_/',
+    publicPath: `/${KARMA_APPLICATION_PATH}/`,
   };
 
   const compilationErrorCb = (error: string | undefined, errors: string[]) => {
@@ -165,10 +165,10 @@ 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.path = `/${KARMA_APPLICATION_PATH}/`;
+  webpackConfig.output.publicPath = `/${KARMA_APPLICATION_PATH}/`;
 
-  let compiler: any;
+  let compiler;
   try {
     compiler = webpack(webpackConfig);
   } catch (e) {
@@ -201,11 +201,10 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
 
   let lastCompilationHash: string | undefined;
   const statsConfig = getWebpackStatsConfig();
-  compiler.hooks.done.tap('karma', (stats: any) => {
-    if (stats.compilation.errors.length > 0) {
-      const json = stats.toJson(config.stats);
+  compiler.hooks.done.tap('karma', (stats) => {
+    if (stats.hasErrors()) {
       // Print compilation errors.
-      logger.error(statsErrorsToString(json, statsConfig));
+      logger.error(statsErrorsToString(stats.compilation, statsConfig));
       lastCompilationHash = undefined;
       // Emit a failure build event if there are compilation errors.
       failureCb();
@@ -219,39 +218,13 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
 
   webpackMiddleware = new webpackDevMiddleware(compiler, webpackMiddlewareConfig);
 
-  // Forward requests to webpack server.
-  customFileHandlers.push({
-    urlRegex: /^\/_karma_webpack_\/.*/,
-    handler: function handler(req: any, res: any) {
-      webpackMiddleware(req, res, function () {
-        // Ensure script and style bundles are served.
-        // They are mentioned in the custom karma context page and we don't want them to 404.
-        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',
-        ];
-        if (alwaysServe.indexOf(req.url) != -1) {
-          res.statusCode = 200;
-          res.end();
-        } else {
-          res.statusCode = 404;
-          res.end('Not found');
-        }
-      });
-    }
-  });
-
   emitter.on('exit', (done: any) => {
     webpackMiddleware.close();
     done();
   });
 };
 
-init.$inject = ['config', 'emitter', 'customFileHandlers'];
+init.$inject = ['config', 'emitter'];
 
 // Block requests until the Webpack compilation is done.
 function requestBlocker() {
@@ -325,17 +298,59 @@ sourceMapReporter.$inject = ['baseReporterDecorator', 'config'];
 
 // When a request is not found in the karma server, try looking for it from the webpack server root.
 function fallbackMiddleware() {
-  return function (req: any, res: any, next: () => void) {
+  return function (request: http.IncomingMessage, response: http.ServerResponse, next: () => void) {
     if (webpackMiddleware) {
-      const webpackUrl = '/_karma_webpack_' + req.url;
-      const webpackReq = { ...req, url: webpackUrl }
-      webpackMiddleware(webpackReq, res, next);
+      if (request.url && !new RegExp(`\\/${KARMA_APPLICATION_PATH}\\/.*`).test(request.url)) {
+        request.url = '/' + KARMA_APPLICATION_PATH + request.url;
+      }
+      webpackMiddleware(request, response, () => {
+        const alwaysServe = [
+          `/${KARMA_APPLICATION_PATH}/runtime.js`,
+          `/${KARMA_APPLICATION_PATH}/polyfills.js`,
+          `/${KARMA_APPLICATION_PATH}/polyfills-es5.js`,
+          `/${KARMA_APPLICATION_PATH}/scripts.js`,
+          `/${KARMA_APPLICATION_PATH}/styles.js`,
+          `/${KARMA_APPLICATION_PATH}/vendor.js`,
+        ];
+        if (request.url && alwaysServe.includes(request.url)) {
+          response.statusCode = 200;
+          response.end();
+        } else {
+          next();
+        }
+      });
     } else {
       next();
     }
   };
 }
 
+/**
+ * Returns a function that returns true if the plugin identifier matches the
+ * `moduleId` or `pluginName`. A plugin identifier can be either a string or
+ * an object according to https://karma-runner.github.io/5.2/config/plugins.html
+ * @param moduleId name of the node module (e.g. karma-coverage)
+ * @param pluginName name of the karma plugin (e.g. reporter:coverage)
+ */
+function isPlugin(moduleId: string, pluginName: string) {
+  return (plugin: string|{}): boolean => {
+    if (typeof plugin === 'string') {
+      if (!plugin.includes('*')) {
+        return plugin === moduleId;
+      }
+      const regexp = new RegExp(`^${plugin.replace('*', '.*')}`);
+      if (regexp.test(moduleId)) {
+        try {
+          require.resolve(moduleId);
+          return true;
+        } catch {}
+      }
+      return false;
+    }
+    return pluginName in plugin;
+  }
+}
+
 module.exports = {
   'framework:@angular-devkit/build-angular': ['factory', init],
   'reporter:@angular-devkit/build-angular--sourcemap-reporter': ['type', sourceMapReporter],
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/named-chunks-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/named-chunks-plugin.ts
index 1e2132672609..74f41914116f 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/named-chunks-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/named-chunks-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts
index 649d2b97e034..4175b52ba001 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -97,12 +97,19 @@ export class OptimizeCssWebpackPlugin {
           }
 
           const cssNanoOptions: cssNano.CssNanoOptions = {
-            preset: ['default', {
-              // Disable SVG optimizations, as this can cause optimizations which are not compatible in all browsers.
-              svgo: false,
-              // Disable `calc` optimizations, due to several issues. #16910, #16875, #17890
-              calc: false,
-            }],
+            preset: [
+              'default',
+              {
+                // Disable SVG optimizations, as this can cause optimizations which are not compatible in all browsers.
+                svgo: false,
+                // Disable `calc` optimizations, due to several issues. #16910, #16875, #17890
+                calc: false,
+                // Disable CSS rules sorted due to several issues #20693
+                // https://github.com/ionic-team/ionic-framework/issues/23266 and
+                // https://github.com/cssnano/cssnano/issues/1054
+                cssDeclarationSorter: false,
+              },
+            ],
           };
 
           const postCssOptions: ProcessOptions = {
@@ -111,11 +118,11 @@ export class OptimizeCssWebpackPlugin {
           };
 
           const output = await new Promise<Result>((resolve, reject) => {
-            // the last parameter is not in the typings
+            // @types/cssnano are not up to date with version 5.
             // tslint:disable-next-line: no-any
-            (cssNano.process as any)(content, postCssOptions, cssNanoOptions)
+            (cssNano as any)(cssNanoOptions).process(content, postCssOptions)
               .then(resolve)
-              .catch(reject);
+              .catch((err: Error) => reject(err));
           });
 
           for (const { text } of output.warnings()) {
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts
index 3fbda764a394..b4f7bffbcc24 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * 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 { Declaration, Plugin } from 'postcss';
 import * as url from 'url';
 import * as webpack from 'webpack';
 
@@ -31,7 +31,7 @@ export interface PostcssCliResourcesOptions {
   rebaseRootRelative?: boolean;
   /** CSS is extracted to a `.css` or is embedded in a `.js` file. */
   extracted?: boolean;
-  filename: string;
+  filename: (resourcePath: string) => string;
   loader: webpack.loader.LoaderContext;
   emitFile: boolean;
 }
@@ -48,31 +48,29 @@ async function resolve(
   }
 }
 
-export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResourcesOptions | undefined) => {
+export const postcss = true;
+
+export default function(options?: PostcssCliResourcesOptions): Plugin {
   if (!options) {
     throw new Error('No options were specified to "postcss-cli-resources".');
   }
 
   const {
     deployUrl = '',
-    baseHref = '',
     resourcesOutputPath = '',
-    rebaseRootRelative = false,
     filename,
     loader,
     emitFile,
     extracted,
   } = options;
 
-  const dedupeSlashes = (url: string) => url.replace(/\/\/+/g, '/');
-
   const process = async (inputUrl: string, context: string, resourceCache: Map<string, string>) => {
     // If root-relative, absolute or protocol relative url, leave as is
     if (/^((?:\w+:)?\/\/|data:|chrome:|#)/.test(inputUrl)) {
       return inputUrl;
     }
 
-    if (!rebaseRootRelative && /^\//.test(inputUrl)) {
+    if (/^\//.test(inputUrl)) {
       return inputUrl;
     }
 
@@ -88,24 +86,6 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       return cachedUrl;
     }
 
-    if (rebaseRootRelative && 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(cacheKey, outputUrl);
-
-      return outputUrl;
-    }
-
     if (inputUrl.startsWith('~')) {
       inputUrl = inputUrl.substr(1);
     }
@@ -133,10 +113,11 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
         }
 
         let outputPath = interpolateName(
-          { resourcePath: result } as webpack.loader.LoaderContext,
-          filename,
-          { content },
-        );
+          {  resourcePath: result } as webpack.loader.LoaderContext,
+          filename(result),
+          { content, context: loader.context || loader.rootContext },
+        )
+        .replace(/\\|\//g, '-');
 
         if (resourcesOutputPath) {
           outputPath = path.posix.join(resourcesOutputPath, outputPath);
@@ -162,21 +143,16 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
     });
   };
 
-  return (root) => {
-    const urlDeclarations: Array<postcss.Declaration> = [];
-    root.walkDecls(decl => {
-      if (decl.value && decl.value.includes('url')) {
-        urlDeclarations.push(decl);
-      }
-    });
-
-    if (urlDeclarations.length === 0) {
-      return;
-    }
+  const resourceCache = new Map<string, string>();
+  const processed = Symbol('postcss-cli-resources');
 
-    const resourceCache = new Map<string, string>();
+  return {
+    postcssPlugin: 'postcss-cli-resources',
+    async Declaration(decl) {
+      if (!decl.value.includes('url') || processed in decl) {
+        return;
+      }
 
-    return Promise.all(urlDeclarations.map(async decl => {
       const value = decl.value;
       const urlRegex = /url\(\s*(?:"([^"]+)"|'([^']+)'|(.+?))\s*\)/g;
       const segments: string[] = [];
@@ -221,6 +197,8 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       if (modified) {
         decl.value = segments.join('');
       }
-    }));
+
+      (decl as Declaration & { [processed]: boolean })[processed] = true;
+    },
   };
-});
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/remove-hash-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/remove-hash-plugin.ts
index 242193a9d54c..46625d83f298 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/remove-hash-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/remove-hash-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts
index 49638ab529da..fe3122ba53c3 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -35,30 +35,33 @@ function addDependencies(compilation: any, scripts: string[]): void {
     compilation.fileDependencies.add(script);
   }
 }
-
-function hook(compiler: any, action: (compilation: any, callback: (err?: Error) => void) => void) {
-  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 {
   private _lastBuildTime?: number;
   private _cachedOutput?: ScriptOutput;
 
   constructor(private options: Partial<ScriptsWebpackPluginOptions> = {}) { }
 
-  shouldSkip(compilation: any, scripts: string[]): boolean {
+  async shouldSkip(compilation: any, scripts: string[]): Promise<boolean> {
     if (this._lastBuildTime == undefined) {
       this._lastBuildTime = Date.now();
       return false;
     }
 
-    for (let i = 0; i < scripts.length; i++) {
-      const scriptTime = compilation.fileTimestamps.get(scripts[i]);
+    for (const script of scripts) {
+      const scriptTime = isWebpackFiveOrHigher()
+        ? await new Promise<number | undefined>((resolve, reject) => {
+          compilation.fileSystemInfo.getFileTimestamp(script, (error: unknown, entry: any) => {
+            if (error) {
+              reject(error);
+
+              return;
+            }
+
+            resolve(typeof entry !== 'string' ? entry.safeTime : undefined)
+          })
+        })
+        : compilation.fileTimestamps.get(script);
+
       if (!scriptTime || scriptTime > this._lastBuildTime) {
         this._lastBuildTime = Date.now();
         return false;
@@ -83,8 +86,14 @@ export class ScriptsWebpackPlugin {
     entrypoint.pushChunk(chunk);
     chunk.addGroup(entrypoint);
     compilation.entrypoints.set(this.options.name, entrypoint);
-    compilation.chunks.push(chunk);
+    if (isWebpackFiveOrHigher()) {
+      compilation.chunks.add(chunk);
+    } else {
+      compilation.chunks.push(chunk);
+    }
+
     compilation.assets[filename] = source;
+    compilation.hooks.chunkAsset.call(chunk, filename);
   }
 
   apply(compiler: Compiler): void {
@@ -96,48 +105,47 @@ export class ScriptsWebpackPlugin {
       .filter(script => !!script)
       .map(script => path.resolve(this.options.basePath || '', script));
 
-    hook(compiler, (compilation, callback) => {
-      if (this.shouldSkip(compilation, scripts)) {
-        if (this._cachedOutput) {
-          this._insertOutput(compilation, this._cachedOutput, true);
-        }
-
-        addDependencies(compilation, scripts);
-        callback();
-
-        return;
-      }
-
-      const sourceGetters = scripts.map(fullPath => {
-        return new Promise<Source>((resolve, reject) => {
-          compilation.inputFileSystem.readFile(fullPath, (err: Error, data: Buffer) => {
-            if (err) {
-              reject(err);
-              return;
+    compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', compilation => {
+      compilation.hooks.additionalAssets.tapPromise('scripts-webpack-plugin', async () => {
+          if (await this.shouldSkip(compilation, scripts)) {
+            if (this._cachedOutput) {
+              this._insertOutput(compilation, this._cachedOutput, true);
             }
 
-            const content = data.toString();
-
-            let source;
-            if (this.options.sourceMap) {
-              // TODO: Look for source map file (for '.min' scripts, etc.)
-
-              let adjustedPath = fullPath;
-              if (this.options.basePath) {
-                adjustedPath = path.relative(this.options.basePath, fullPath);
-              }
-              source = new OriginalSource(content, adjustedPath);
-            } else {
-              source = new RawSource(content);
-            }
-
-            resolve(source);
+            addDependencies(compilation, scripts);
+
+            return;
+          }
+
+          const sourceGetters = scripts.map(fullPath => {
+            return new Promise<Source>((resolve, reject) => {
+              compilation.inputFileSystem.readFile(fullPath, (err: Error, data: Buffer) => {
+                if (err) {
+                  reject(err);
+                  return;
+                }
+
+                const content = data.toString();
+
+                let source;
+                if (this.options.sourceMap) {
+                  // TODO: Look for source map file (for '.min' scripts, etc.)
+
+                  let adjustedPath = fullPath;
+                  if (this.options.basePath) {
+                    adjustedPath = path.relative(this.options.basePath, fullPath);
+                  }
+                  source = new OriginalSource(content, adjustedPath);
+                } else {
+                  source = new RawSource(content);
+                }
+
+                resolve(source);
+              });
+            });
           });
-        });
-      });
 
-      Promise.all(sourceGetters)
-        .then(sources => {
+          const sources = await Promise.all(sourceGetters);
           const concatSource = new ConcatSource();
           sources.forEach(source => {
             concatSource.add(source);
@@ -155,10 +163,7 @@ export class ScriptsWebpackPlugin {
           this._insertOutput(compilation, output);
           this._cachedOutput = output;
           addDependencies(compilation, scripts);
-
-          callback();
-        })
-        .catch((err: Error) => callback(err));
+        });
     });
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/single-test-transform.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/single-test-transform.ts
index 982fa4de5869..71c3a43af104 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/single-test-transform.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/single-test-transform.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/suppress-entry-chunks-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/suppress-entry-chunks-webpack-plugin.ts
index 882506509ed6..32825bb6ff49 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/suppress-entry-chunks-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/suppress-entry-chunks-webpack-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/webpack-rollup-loader.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/webpack-rollup-loader.ts
index 2253f1ccfb28..b83fa498837b 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/webpack-rollup-loader.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/webpack-rollup-loader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts
index 5c7657e47339..db06cc258dbc 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts
@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
-import { NormalizedEntryPoint } from '../configs';
+import { NormalizedEntryPoint } from './helpers';
 
 /**
  * Webpack stats may incorrectly mark extra entry points `initial` chunks, when
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts
index da690efb05fd..91d4058b6e84 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts b/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts
index 73e9742d8a2e..65aacf882cfa 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts
@@ -1,15 +1,17 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, normalize } from '@angular-devkit/core';
+import * as path from 'path';
 import { ScriptTarget } from 'typescript';
-import { SourceMapDevToolPlugin } from 'webpack';
+import { Options, SourceMapDevToolPlugin } from 'webpack';
 import { ExtraEntryPoint, ExtraEntryPointClass } from '../../browser/schema';
+import { withWebpackFourOrFive } from '../../utils/webpack-version';
 
 export interface HashFormat {
   chunk: string;
@@ -72,7 +74,6 @@ export function getSourceMapDevTool(
   stylesSourceMap: boolean | undefined,
   hiddenSourceMap = false,
   inlineSourceMap = false,
-  vendorSourceMap = false,
 ): SourceMapDevToolPlugin {
   const include = [];
   if (scriptsSourceMap) {
@@ -93,7 +94,6 @@ export function getSourceMapDevTool(
     sourceRoot: 'webpack:///',
     moduleFilenameTemplate: '[resource-path]',
     append: hiddenSourceMap ? false : undefined,
-    exclude: vendorSourceMap ? undefined : /vendor.*\.js/,
   });
 }
 
@@ -118,3 +118,37 @@ export function getEsVersionForFileName(
 export function isPolyfillsEntry(name: string): boolean {
   return name === 'polyfills' || name === 'polyfills-es5';
 }
+
+export function getWatchOptions(poll: number | undefined): Options.WatchOptions {
+  return {
+    poll,
+    ignored: poll === undefined ? undefined : withWebpackFourOrFive(/[\\\/]node_modules[\\\/]/, 'node_modules/**'),
+  };
+}
+
+export function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string {
+  const visitedFiles = new Map<string, string>();
+
+  return (resourcePath: string) => {
+    if (hashFormat.file) {
+      // File names are hashed therefore we don't need to handle files with the same file name.
+      return `[name]${hashFormat.file}.[ext]`;
+    }
+
+    const filename = path.basename(resourcePath);
+    // Check if the file with the same name has already been processed.
+    const visited = visitedFiles.get(filename);
+    if (!visited) {
+      // Not visited.
+      visitedFiles.set(filename, resourcePath);
+
+      return filename;
+    } else if (visited === resourcePath) {
+      // Same file.
+      return filename;
+    }
+
+    // File has the same name but it's in a different location.
+    return '[path][name].[ext]';
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts b/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
index 0a4b1faa0704..45877bb2b94a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -12,6 +12,8 @@ import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
 import * as path from 'path';
 import * as textTable from 'text-table';
 import { colors as ansiColors, removeColor } from '../../utils/color';
+import { Configuration, Stats } from 'webpack';
+import { isWebpackFiveOrHigher } from '../../utils/webpack-version';
 
 export function formatSize(size: number): string {
   if (size <= 0) {
@@ -20,15 +22,20 @@ export function formatSize(size: number): string {
 
   const abbreviations = ['bytes', 'kB', 'MB', 'GB'];
   const index = Math.floor(Math.log(size) / Math.log(1024));
-
-  return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${abbreviations[index]}`;
+  const roundedSize = size / Math.pow(1024, index);
+  // bytes don't have a fraction
+  const fractionDigits = index === 0 ? 0 : 2;
+  return `${roundedSize.toFixed(fractionDigits)} ${abbreviations[index]}`;
 }
 
-export type BundleStatsData = [files: string, names: string, size: string];
+export type BundleStatsData = [files: string, names: string, size: number | string];
+
+export type ChunkType = 'modern' | 'legacy' | 'unknown';
 
 export interface BundleStats {
   initial: boolean;
   stats: BundleStatsData;
+  chunkType: ChunkType;
 };
 
 export function generateBundleStats(
@@ -39,38 +46,71 @@ export function generateBundleStats(
     entry: boolean;
     initial: boolean;
     rendered?: boolean;
+    chunkType?: ChunkType,
   },
-  colors: boolean,
 ): BundleStats {
-  const g = (x: string) => (colors ? ansiColors.greenBright(x) : x);
-  const c = (x: string) => (colors ? ansiColors.cyanBright(x) : x);
-
-  const size = typeof info.size === 'number' ? formatSize(info.size) : '-';
+  const size = typeof info.size === 'number' ? info.size : '-';
   const files = info.files.filter(f => !f.endsWith('.map')).map(f => path.basename(f)).join(', ');
   const names = info.names?.length ? info.names.join(', ') : '-';
   const initial = !!(info.entry || info.initial);
+  const chunkType = info.chunkType || 'unknown';
 
   return {
+    chunkType,
     initial,
-    stats: [g(files), names, c(size)],
+    stats: [files, names, size],
   }
 }
 
-export function generateBuildStatsTable(data: BundleStats[], colors: boolean): string {
+function generateBuildStatsTable(data: BundleStats[], colors: boolean, showTotalSize: boolean): string {
+  const g = (x: string) => colors ? ansiColors.greenBright(x) : x;
+  const c = (x: string) => colors ? ansiColors.cyanBright(x) : x;
+  const bold = (x: string) => colors ? ansiColors.bold(x) : x;
+  const dim = (x: string) => colors ? ansiColors.dim(x) : x;
+
   const changedEntryChunksStats: BundleStatsData[] = [];
   const changedLazyChunksStats: BundleStatsData[] = [];
-  for (const {initial, stats} of data) {
+
+  let initialModernTotalSize = 0;
+  let initialLegacyTotalSize = 0;
+  let modernFileSuffix: string | undefined;
+
+  for (const { initial, stats, chunkType } of data) {
+    const [files, names, size] = stats;
+
+    const data: BundleStatsData = [
+      g(files),
+      names,
+      c(typeof size === 'number' ? formatSize(size) : size),
+    ];
+
     if (initial) {
-      changedEntryChunksStats.push(stats);
+      changedEntryChunksStats.push(data);
+
+      if (typeof size === 'number') {
+        switch (chunkType) {
+          case 'modern':
+            initialModernTotalSize += size;
+            if (!modernFileSuffix) {
+              const match = files.match(/-(es20\d{2}|esnext)/);
+              modernFileSuffix = match?.[1].toString().toUpperCase();
+            }
+            break;
+          case 'legacy':
+            initialLegacyTotalSize += size;
+            break;
+          default:
+            initialModernTotalSize += size;
+            initialLegacyTotalSize += size;
+            break;
+        }
+      }
     } else {
-      changedLazyChunksStats.push(stats);
+      changedLazyChunksStats.push(data);
     }
   }
 
-  const bundleInfo: string[][] = [];
-
-  const bold = (x: string) => colors ? ansiColors.bold(x) : x;
-  const dim = (x: string) => colors ? ansiColors.dim(x) : x;
+  const bundleInfo: (string | number)[][] = [];
 
   // Entry chunks
   if (changedEntryChunksStats.length) {
@@ -78,6 +118,18 @@ export function generateBuildStatsTable(data: BundleStats[], colors: boolean): s
       ['Initial Chunk Files', 'Names', 'Size'].map(bold),
       ...changedEntryChunksStats,
     );
+
+    if (showTotalSize) {
+      bundleInfo.push([]);
+      if (initialModernTotalSize === initialLegacyTotalSize) {
+        bundleInfo.push([' ', 'Initial Total', formatSize(initialModernTotalSize)].map(bold));
+      } else {
+        bundleInfo.push(
+          [' ', 'Initial ES5 Total', formatSize(initialLegacyTotalSize)].map(bold),
+          [' ', `Initial ${modernFileSuffix} Total`, formatSize(initialModernTotalSize)].map(bold),
+        );
+      }
+    }
   }
 
   // Seperator
@@ -89,38 +141,60 @@ export function generateBuildStatsTable(data: BundleStats[], colors: boolean): s
   if (changedLazyChunksStats.length) {
     bundleInfo.push(
       ['Lazy Chunk Files', 'Names', 'Size'].map(bold),
-    ...changedLazyChunksStats,
+      ...changedLazyChunksStats,
     );
   }
 
   return textTable(bundleInfo, {
     hsep: dim(' | '),
     stringLength: s => removeColor(s).length,
+    align: ['l', 'l', 'r'],
   });
 }
 
-export function generateBuildStats(hash: string, time: number, colors: boolean): string {
+function generateBuildStats(hash: string, time: number, colors: boolean): string {
   const w = (x: string) => colors ? ansiColors.bold.white(x) : x;
   return `Build at: ${w(new Date().toISOString())} - Hash: ${w(hash)} - Time: ${w('' + time)}ms`;
 }
 
-export function statsToString(json: any, statsConfig: any) {
+function statsToString(json: any, statsConfig: any, bundleState?: BundleStats[]): string {
   const colors = statsConfig.colors;
   const rs = (x: string) => colors ? ansiColors.reset(x) : x;
 
-  const changedChunksStats: BundleStats[] = [];
-  for (const chunk of json.chunks) {
-    if (!chunk.rendered) {
-      continue;
-    }
+  const changedChunksStats: BundleStats[] = bundleState ?? [];
+  let unchangedChunkNumber = 0;
+  if (!bundleState?.length) {
+    for (const chunk of json.chunks) {
+      if (!chunk.rendered) {
+        continue;
+      }
 
-    const assets = json.assets.filter((asset: any) => chunk.files.includes(asset.name));
-    const summedSize = assets.filter((asset: any) => !asset.name.endsWith(".map")).reduce((total: number, asset: any) => { return total + asset.size }, 0);
-    changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }, colors));
+      const assets = json.assets.filter((asset: any) => chunk.files.includes(asset.name));
+      const summedSize = assets.filter((asset: any) => !asset.name.endsWith(".map")).reduce((total: number, asset: any) => { return total + asset.size }, 0);
+      changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }));
+    }
+    unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
   }
 
-  const unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
-  const statsTable = generateBuildStatsTable(changedChunksStats, colors);
+  // Sort chunks by size in descending order
+  changedChunksStats.sort((a, b) => {
+    if (a.stats[2] > b.stats[2]) {
+      return -1;
+    }
+
+    if (a.stats[2] < b.stats[2]) {
+      return 1;
+    }
+
+    return 0;
+  });
+
+  const statsTable = generateBuildStatsTable(changedChunksStats, colors, unchangedChunkNumber === 0);
+
+  // In some cases we do things outside of webpack context
+  // Such us index generation, service worker augmentation etc...
+  // This will correct the time and include these.
+  const time = (Date.now() - json.builtAt) + json.time;
 
   if (unchangedChunkNumber > 0) {
     return '\n' + rs(tags.stripIndents`
@@ -128,24 +202,30 @@ export function statsToString(json: any, statsConfig: any) {
 
       ${unchangedChunkNumber} unchanged chunks
 
-      ${generateBuildStats(json.hash, json.time, colors)}
+      ${generateBuildStats(json.hash, time, colors)}
       `);
   } else {
     return '\n' + rs(tags.stripIndents`
       ${statsTable}
 
-      ${generateBuildStats(json.hash, json.time, colors)}
+      ${generateBuildStats(json.hash, time, colors)}
       `);
   }
 }
 
-const ERRONEOUS_WARNINGS_FILTER = (warning: string) => ![
-  // TODO(#16193): Don't emit this warning in the first place rather than just suppressing it.
-  /multiple assets emit different content.*3rdpartylicenses\.txt/i,
+export const IGNORE_WARNINGS = [
   // Webpack 5+ has no facility to disable this warning.
   // System.import is used in @angular/core for deprecated string-form lazy routes
   /System.import\(\) is deprecated and will be removed soon/i,
-].some(msg => msg.test(warning));
+  // https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
+  /Failed to parse source map from/,
+];
+
+// TODO: remove when Webpack 4 is no longer supported.
+// See: https://webpack.js.org/configuration/other-options/#ignorewarnings
+const ERRONEOUS_WARNINGS_FILTER = isWebpackFiveOrHigher()
+  ? (warning: string) => warning
+  : (warning: string) => !IGNORE_WARNINGS.some(msg => msg.test(warning));
 
 interface WebpackDiagnostic {
   message: string;
@@ -177,7 +257,7 @@ export function statsWarningsToString(json: any, statsConfig: any): string {
       output += yb(`Warning: ${warning}\n\n`);
     } else {
       if (!ERRONEOUS_WARNINGS_FILTER(warning.message)) {
-          continue;
+        continue;
       }
       const file = warning.file || warning.moduleName;
       if (file) {
@@ -195,7 +275,7 @@ export function statsWarningsToString(json: any, statsConfig: any): string {
   }
 
   if (output) {
-      return '\n' + output;
+    return '\n' + output;
   }
 
   return '';
@@ -236,7 +316,7 @@ export function statsErrorsToString(json: any, statsConfig: any): string {
   }
 
   if (output) {
-      return '\n' + output;
+    return '\n' + output;
   }
 
   return '';
@@ -256,19 +336,26 @@ export function createWebpackLoggingCallback(
   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 (statsHasWarnings(json)) {
-      logger.warn(statsWarningsToString(json, config.stats));
-    }
-    if (statsHasErrors(json)) {
-      logger.error(statsErrorsToString(json, config.stats));
-    }
-  };
+    webpackStatsLogger(logger, stats.toJson(config.stats), config);
+  }
 }
+
+export function webpackStatsLogger(
+  logger: logging.LoggerApi,
+  json: Stats.ToJsonOutput,
+  config: Configuration,
+  bundleStats?: BundleStats[],
+): void {
+  logger.info(statsToString(json, config.stats, bundleStats));
+
+  if (statsHasWarnings(json)) {
+    logger.warn(statsWarningsToString(json, config.stats));
+  }
+  if (statsHasErrors(json)) {
+    logger.error(statsErrorsToString(json, config.stats));
+  }
+};
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/angular.json b/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
index a2d82cb3cff6..060a1593f6a0 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/angular.json
@@ -48,6 +48,16 @@
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
+            },
+            "inline-critical-css": {
+              "optimization": {
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": true
+                },
+                "scripts": true,
+                "fonts": true
+              }
             }
           }
         },
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.e2e-spec.ts b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.e2e-spec.ts
index 05f1adf816da..490111853678 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.e2e-spec.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.e2e-spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.po.ts b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.po.ts
index a38be4b23cde..f6fd48651736 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.po.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/app.po.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json
index c92199cfd63f..a82df00eef37 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json
@@ -6,7 +6,6 @@
     "target": "es2018",
     "types": [
       "jasmine",
-      "jasminewd2",
       "node"
     ]
   }
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/karma.conf.js b/packages/angular_devkit/build_angular/test/hello-world-app/karma.conf.js
index 9e73f21d849a..6dab02886bb6 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/karma.conf.js
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/karma.conf.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -25,6 +25,9 @@ module.exports = function(config) {
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageReporter: {
       dir: path.join(__dirname, './coverage'),
       subdir: '.',
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/protractor.conf.js b/packages/angular_devkit/build_angular/test/hello-world-app/protractor.conf.js
index 58a5d0170c76..0a14d0388a89 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/protractor.conf.js
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/protractor.conf.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.spec.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.spec.ts
index d3dde56aacc1..018aa70b9590 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.spec.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.ts
index 7ea162bf0946..a091388cb1a4 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.module.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.module.ts
index c61881ebb3eb..08c28e5ddfac 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.module.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.server.module.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.server.module.ts
index bb56e2795c22..0dbdc7eee555 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.server.module.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/app/app.server.module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.prod.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.prod.ts
index 585b70e8c518..e68acec70d48 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.prod.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.ts
index 7a2b5a1e7ce5..53e1165805b4 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/environments/environment.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts
index 340dffcdf657..f8d508c9c397 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.ts
index cb8269cc1ad4..1fe7e025a009 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/polyfills.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/polyfills.ts
index 397e95e012de..a465cfb842fc 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/polyfills.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/polyfills.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
index 9d5dd81e683f..51076cd255f3 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/test.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/typings.d.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/typings.d.ts
index fe59b01a3b02..6259785e38ba 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/src/typings.d.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/typings.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json b/packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json
index 5015054494d9..691d89d19a7e 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json
@@ -20,6 +20,7 @@
   },
   "angularCompilerOptions": {
     "enableIvy": true,
-    "disableTypeScriptVersionCheck": true
+    "disableTypeScriptVersionCheck": true,
+    "strictTemplates": true
   }
 }
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/karma.conf.js b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/karma.conf.js
index 2f49ecb6df61..88c06868c675 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/karma.conf.js
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/karma.conf.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -22,6 +22,9 @@ module.exports = function (config) {
     client: {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, 'coverage'),
       reports: ['html', 'lcovonly'],
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/package.json b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/package.json
index c6c6efd446f6..5917d86fecca 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/package.json
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/package.json
@@ -2,7 +2,7 @@
   "name": "lib",
   "version": "0.0.1",
   "peerDependencies": {
-    "@angular/common": "^10.0.0",
-    "@angular/core": "^10.0.0"
+    "@angular/common": "^11.0.0",
+    "@angular/core": "^11.0.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.spec.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.spec.ts
index 2694b8dea5a2..5d8eccaf3a47 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.spec.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.ts
index 3fcbd0a37c78..90506137863d 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts
index 4db2feed5ae3..ba9debdd7c3d 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.spec.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.spec.ts
index a808deee36e3..c85aa5235c49 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.spec.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.ts
index e8be2fbdc25e..ad3cff332127 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.service.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts
index d3a2dc0db030..bd0f2b029a24 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts
index 92e85eee480c..79c2ad36094a 100644
--- a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts
+++ b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/test.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 6bce88d48955..9cb7f9f4a443 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "loader-utils": "2.0.0",
     "source-map": "0.7.3",
-    "tslib": "2.0.3",
-    "typescript": "4.0.3",
-    "webpack-sources": "2.0.1"
+    "tslib": "2.1.0",
+    "typescript": "4.1.5",
+    "webpack-sources": "2.2.0"
   }
 }
diff --git a/packages/angular_devkit/build_optimizer/src/_golden-api.ts b/packages/angular_devkit/build_optimizer/src/_golden-api.ts
index 06e63e7a2c84..9a87174f401e 100644
--- a/packages/angular_devkit/build_optimizer/src/_golden-api.ts
+++ b/packages/angular_devkit/build_optimizer/src/_golden-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 209f409c345e..6baa6a2505aa 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -37,6 +37,7 @@ const knownSideEffectFreeAngularModules = [
   /[\\/]node_modules[\\/]@angular[\\/]upgrade[\\/]/,
   /[\\/]node_modules[\\/]@angular[\\/]material[\\/]/,
   /[\\/]node_modules[\\/]@angular[\\/]cdk[\\/]/,
+  /[\\/]node_modules[\\/]rxjs[\\/]/,
 ];
 
 // Factories created by AOT are known to have no side effects.
@@ -53,6 +54,11 @@ function isKnownCoreFile(filePath: string) {
 }
 
 function isKnownSideEffectFree(filePath: string) {
+  // rxjs add imports contain intentional side effects
+  if (/[\\/]node_modules[\\/]rxjs[\\/]add[\\/]/.test(filePath)) {
+    return false;
+  }
+
   return ngFactories.some((s) => filePath.endsWith(s)) ||
     knownSideEffectFreeAngularModules.some((re) => re.test(filePath));
 }
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 a7b094d5589f..1644091247f9 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 f09f53defddc..bf00e7dda320 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 cb661c66abbe..b093f9817a4f 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 ee0c91f8a6f1..84fb5dcb7930 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 fbc273993021..228d3752fb8e 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
@@ -1,7 +1,7 @@
 
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 d035dda72612..6466dfcd6e8d 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 91628bee2acf..a4143228aadb 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 4d4c11ab9c79..3cc3149cd57d 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 77d01ab12491..ef8207affda2 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 21149b28bf00..e8a7dcced38d 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 d058047284f9..6ae685c9c339 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 ec7bb8fd0fdd..d3fc4fa1eede 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 afdbdee7ad01..60563eaedc6c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 80c045ef430c..23c46de0596c 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 33e6cbd0b59e..67399068885a 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,10 +10,10 @@ import { addPureComment } from '../helpers/ast-utils';
 
 function isBlockLike(node: ts.Node): node is ts.BlockLike {
   return node.kind === ts.SyntaxKind.Block
-      || node.kind === ts.SyntaxKind.ModuleBlock
-      || node.kind === ts.SyntaxKind.CaseClause
-      || node.kind === ts.SyntaxKind.DefaultClause
-      || node.kind === ts.SyntaxKind.SourceFile;
+    || node.kind === ts.SyntaxKind.ModuleBlock
+    || node.kind === ts.SyntaxKind.CaseClause
+    || node.kind === ts.SyntaxKind.DefaultClause
+    || node.kind === ts.SyntaxKind.SourceFile;
 }
 
 export function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile> {
@@ -21,7 +21,7 @@ export function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>
     const transformer: ts.Transformer<ts.SourceFile> = sf => {
       const result = visitBlockStatements(sf.statements, context);
 
-      return ts.updateSourceFileNode(sf, ts.setTextRange(result, sf.statements));
+      return context.factory.updateSourceFile(sf, ts.setTextRange(result, sf.statements));
     };
 
     return transformer;
@@ -32,9 +32,9 @@ function visitBlockStatements(
   statements: ts.NodeArray<ts.Statement>,
   context: ts.TransformationContext,
 ): ts.NodeArray<ts.Statement> {
-
   // copy of statements to modify; lazy initialized
   let updatedStatements: Array<ts.Statement> | undefined;
+  const nodeFactory = context.factory;
 
   const visitor: ts.Visitor = (node) => {
     if (isBlockLike(node)) {
@@ -45,13 +45,13 @@ function visitBlockStatements(
       result = ts.setTextRange(result, node.statements);
       switch (node.kind) {
         case ts.SyntaxKind.Block:
-          return ts.updateBlock(node, result);
+          return nodeFactory.updateBlock(node, result);
         case ts.SyntaxKind.ModuleBlock:
-          return ts.updateModuleBlock(node, result);
+          return nodeFactory.updateModuleBlock(node, result);
         case ts.SyntaxKind.CaseClause:
-          return ts.updateCaseClause(node, node.expression, result);
+          return nodeFactory.updateCaseClause(node, node.expression, result);
         case ts.SyntaxKind.DefaultClause:
-          return ts.updateDefaultClause(node, result);
+          return nodeFactory.updateDefaultClause(node, result);
         default:
           return node;
       }
@@ -97,6 +97,7 @@ function visitBlockStatements(
             // update IIFE and replace variable statement and old IIFE
             oldStatementsLength = 2;
             newStatement = updateEnumIife(
+              nodeFactory,
               currentStatement,
               iife[0],
               iife[1],
@@ -118,6 +119,7 @@ function visitBlockStatements(
 
           oldStatementsLength = classStatements.length;
           newStatement = createWrappedClass(
+            nodeFactory,
             variableDeclaration,
             classStatements,
           );
@@ -134,11 +136,12 @@ function visitBlockStatements(
 
       oldStatementsLength = classStatements.length;
       newStatement = createWrappedClass(
+        nodeFactory,
         currentStatement,
         classStatements,
       );
 
-      oIndex += classStatements.length - 1;
+      oIndex += oldStatementsLength - 1;
     }
 
     if (newStatement && newStatement.length > 0) {
@@ -163,7 +166,7 @@ function visitBlockStatements(
 
   // if changes, return updated statements
   // otherwise, return original array instance
-  return updatedStatements ? ts.createNodeArray(updatedStatements) : statements;
+  return updatedStatements ? nodeFactory.createNodeArray(updatedStatements) : statements;
 }
 
 // TS 2.3 enums have statements that are inside a IIFE.
@@ -251,20 +254,22 @@ function findEnumIife(
 }
 
 function updateHostNode(
+  nodeFactory: ts.NodeFactory,
   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(
+  const outerVarStmt = nodeFactory.updateVariableStatement(
     hostNode,
     hostNode.modifiers,
-    ts.updateVariableDeclarationList(
+    nodeFactory.updateVariableDeclarationList(
       hostNode.declarationList,
       [
-        ts.updateVariableDeclaration(
+        nodeFactory.updateVariableDeclaration(
           variableDeclaration,
           variableDeclaration.name,
+          variableDeclaration.exclamationToken,
           variableDeclaration.type,
           expression,
         ),
@@ -353,23 +358,24 @@ function findStatements(
 }
 
 function updateEnumIife(
+  nodeFactory: ts.NodeFactory,
   hostNode: ts.VariableStatement,
   iife: ts.CallExpression,
   exportAssignment?: ts.Expression,
 ): ts.Statement[] {
   if (!ts.isParenthesizedExpression(iife.expression)
-      || !ts.isFunctionExpression(iife.expression.expression)) {
+    || !ts.isFunctionExpression(iife.expression.expression)) {
     throw new Error('Invalid IIFE Structure');
   }
 
   // Ignore export assignment if variable is directly exported
   if (hostNode.modifiers
-      && hostNode.modifiers.findIndex(m => m.kind == ts.SyntaxKind.ExportKeyword) != -1) {
+    && hostNode.modifiers.findIndex(m => m.kind == ts.SyntaxKind.ExportKeyword) != -1) {
     exportAssignment = undefined;
   }
 
   const expression = iife.expression.expression;
-  const updatedFunction = ts.updateFunctionExpression(
+  const updatedFunction = nodeFactory.updateFunctionExpression(
     expression,
     expression.modifiers,
     expression.asteriskToken,
@@ -377,22 +383,22 @@ function updateEnumIife(
     expression.typeParameters,
     expression.parameters,
     expression.type,
-    ts.updateBlock(
+    nodeFactory.updateBlock(
       expression.body,
       [
         ...expression.body.statements,
-        ts.createReturn(expression.parameters[0].name as ts.Identifier),
+        nodeFactory.createReturnStatement(expression.parameters[0].name as ts.Identifier),
       ],
     ),
   );
 
-  let arg: ts.Expression = ts.createObjectLiteral();
+  let arg: ts.Expression = nodeFactory.createObjectLiteralExpression();
   if (exportAssignment) {
-    arg = ts.createBinary(exportAssignment, ts.SyntaxKind.BarBarToken, arg);
+    arg = nodeFactory.createBinaryExpression(exportAssignment, ts.SyntaxKind.BarBarToken, arg);
   }
-  const updatedIife = ts.updateCall(
+  const updatedIife = nodeFactory.updateCallExpression(
     iife,
-    ts.updateParen(
+    nodeFactory.updateParenthesizedExpression(
       iife.expression,
       updatedFunction,
     ),
@@ -402,49 +408,17 @@ function updateEnumIife(
 
   let value: ts.Expression = addPureComment(updatedIife);
   if (exportAssignment) {
-    value = ts.createBinary(
+    value = nodeFactory.createBinaryExpression(
       exportAssignment,
       ts.SyntaxKind.FirstAssignment,
       updatedIife);
   }
 
-  return [updateHostNode(hostNode, value)];
-}
-
-function createWrappedEnum(
-  name: string,
-  hostNode: ts.VariableStatement,
-  statements: Array<ts.Statement>,
-  literalInitializer: ts.ObjectLiteralExpression = ts.createObjectLiteral(),
-  addExportModifier = false,
-): ts.Statement[] {
-  const node = addExportModifier
-    ? ts.updateVariableStatement(
-      hostNode,
-      [ts.createToken(ts.SyntaxKind.ExportKeyword)],
-      hostNode.declarationList,
-    )
-    : hostNode;
-
-  const innerVarStmt = ts.createVariableStatement(
-    undefined,
-    ts.createVariableDeclarationList([
-      ts.createVariableDeclaration(name, undefined, literalInitializer),
-    ]),
-  );
-
-  const innerReturn = ts.createReturn(ts.createIdentifier(name));
-
-  const iife = ts.createImmediatelyInvokedFunctionExpression([
-    innerVarStmt,
-    ...statements,
-    innerReturn,
-  ]);
-
-  return [updateHostNode(node, addPureComment(ts.createParen(iife)))];
+  return [updateHostNode(nodeFactory, hostNode, value)];
 }
 
 function createWrappedClass(
+  nodeFactory: ts.NodeFactory,
   hostNode: ts.ClassDeclaration | ts.VariableDeclaration,
   statements: ts.Statement[],
 ): ts.Statement[] {
@@ -453,7 +427,7 @@ function createWrappedClass(
   const updatedStatements = [...statements];
 
   if (ts.isClassDeclaration(hostNode)) {
-    updatedStatements[0] = ts.createClassDeclaration(
+    updatedStatements[0] = nodeFactory.createClassDeclaration(
       hostNode.decorators,
       undefined,
       hostNode.name,
@@ -464,9 +438,9 @@ function createWrappedClass(
   }
 
   const pureIife = addPureComment(
-    ts.createImmediatelyInvokedArrowFunction([
+    nodeFactory.createImmediatelyInvokedArrowFunction([
       ...updatedStatements,
-      ts.createReturn(ts.createIdentifier(name)),
+      nodeFactory.createReturnStatement(nodeFactory.createIdentifier(name)),
     ]),
   );
 
@@ -476,22 +450,22 @@ function createWrappedClass(
 
   const newStatement: ts.Statement[] = [];
   newStatement.push(
-    ts.createVariableStatement(
+    nodeFactory.createVariableStatement(
       isDefault ? undefined : modifiers,
-      ts.createVariableDeclarationList([
-        ts.createVariableDeclaration(name, undefined, pureIife),
+      nodeFactory.createVariableDeclarationList([
+        nodeFactory.createVariableDeclaration(name, undefined, undefined, pureIife),
       ],
-        ts.NodeFlags.Let,
+      ts.NodeFlags.Let,
       ),
     ));
 
   if (isDefault) {
     newStatement.push(
-      ts.createExportAssignment(
+      nodeFactory.createExportAssignment(
         undefined,
         undefined,
         false,
-        ts.createIdentifier(name),
+        nodeFactory.createIdentifier(name),
       ));
   }
 
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 0789b1c5643b..fccb027e4d5a 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/src/index.ts b/packages/angular_devkit/build_webpack/src/index.ts
index fbd92d0eb827..4bc5882c6b65 100644
--- a/packages/angular_devkit/build_webpack/src/index.ts
+++ b/packages/angular_devkit/build_webpack/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
index e0905269e949..693ae900a002 100644
--- a/packages/angular_devkit/build_webpack/src/utils.ts
+++ b/packages/angular_devkit/build_webpack/src/utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 6cc7661ba968..b8657ba07b37 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
@@ -1,13 +1,14 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
-import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
+import { json } from '@angular-devkit/core';
 import * as net from 'net';
+import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
@@ -112,9 +113,9 @@ export function runWebpackDevServer(
 export default createBuilder<
   json.JsonObject & WebpackDevServerBuilderSchema, DevServerBuildOutput
 >((options, context) => {
-  const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig));
+  const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
 
-  return from(import(getSystemPath(configPath))).pipe(
+  return from(import(configPath)).pipe(
     switchMap((config: webpack.Configuration) => runWebpackDevServer(config, context)),
   );
 });
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts
index 0c62d1c1383f..1ac818f293d9 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 6fc1f3751e4a..f6530cc005a0 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -1,12 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
+import { json } from '@angular-devkit/core';
+import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
@@ -33,8 +34,13 @@ export function runWebpack(
   options: {
     logging?: WebpackLoggingCallback,
     webpackFactory?: WebpackFactory,
+    shouldProvideStats?: boolean,
   } = {},
 ): Observable<BuildResult> {
+  const {
+    logging: log = (stats, config) => context.logger.info(stats.toString(config.stats)),
+    shouldProvideStats = true,
+  } = options;
   const createWebpack = (c: webpack.Configuration) => {
     if (options.webpackFactory) {
       const result = options.webpackFactory(c);
@@ -47,11 +53,14 @@ export function runWebpack(
       return of(webpack(c));
     }
   };
-  const log: WebpackLoggingCallback = options.logging
-    || ((stats, config) => context.logger.info(stats.toString(config.stats)));
 
   return createWebpack({ ...config, watch: false }).pipe(
     switchMap(webpackCompiler => new Observable<BuildResult>(obs => {
+      // Webpack 5 has a compiler level close function
+      const compilerClose = (webpackCompiler as { close?(callback: () => void): void }).close?.bind(
+        webpackCompiler,
+      );
+
       const callback = (err?: Error, stats?: webpack.Stats) => {
         if (err) {
           return obs.error(err);
@@ -66,12 +75,16 @@ export function runWebpack(
 
         obs.next({
           success: !stats.hasErrors(),
-          webpackStats: stats.toJson(),
+          webpackStats: shouldProvideStats ? stats.toJson() : undefined,
           emittedFiles: getEmittedFiles(stats.compilation),
         } as unknown as BuildResult);
 
         if (!config.watch) {
-          obs.complete();
+          if (compilerClose) {
+            compilerClose(() => obs.complete());
+          } else {
+            obs.complete();
+          }
         }
       };
 
@@ -81,7 +94,10 @@ export function runWebpack(
           const watching = webpackCompiler.watch(watchOptions, callback);
 
           // Teardown logic. Close the watcher when unsubscribed from.
-          return () => watching.close(() => { });
+          return () => {
+            watching.close(() => { });
+            compilerClose?.(() => { });
+          };
         } else {
           webpackCompiler.run(callback);
         }
@@ -97,9 +113,9 @@ export function runWebpack(
 
 
 export default createBuilder<WebpackBuilderSchema>((options, context) => {
-  const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig));
+  const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
 
-  return from(import(getSystemPath(configPath))).pipe(
+  return from(import(configPath)).pipe(
     switchMap((config: webpack.Configuration) => runWebpack(config, context)),
   );
 });
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec.ts
index ee09eaa6dce6..8c7068b645bf 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.spec.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.spec.ts
index 869493ff9aeb..ac4005c4504a 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.spec.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts
index 8366380cf61a..81881a3a3abd 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.module.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.module.ts
index c61881ebb3eb..08c28e5ddfac 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.module.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.prod.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.prod.ts
index fac764c6d237..b747891fd137 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.prod.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.ts
index a3fe55067a9c..b92863c59b88 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/environments/environment.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/main.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/main.ts
index 3d8f375e6f4f..a410d4d1c7d5 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/main.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/main.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/polyfills.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/polyfills.ts
index 1b2d66b61857..114cfd897750 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/polyfills.ts
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/polyfills.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/_golden-api.ts b/packages/angular_devkit/core/node/_golden-api.ts
index 1e8277d996a8..60d68936181f 100644
--- a/packages/angular_devkit/core/node/_golden-api.ts
+++ b/packages/angular_devkit/core/node/_golden-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 07cb5ef39aa9..59582a757c8f 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/experimental/index.ts b/packages/angular_devkit/core/node/experimental/index.ts
index 012ac72a4ae5..718ed0fb0820 100644
--- a/packages/angular_devkit/core/node/experimental/index.ts
+++ b/packages/angular_devkit/core/node/experimental/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/experimental/jobs/index.ts b/packages/angular_devkit/core/node/experimental/jobs/index.ts
index d931a0289414..f01c2aebe9d4 100644
--- a/packages/angular_devkit/core/node/experimental/jobs/index.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts b/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
index 6c60ef8c5069..cdeb8b64a2ac 100644
--- a/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts b/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
index 2a46aa873995..7c9672f31858 100644
--- a/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/fs.ts b/packages/angular_devkit/core/node/fs.ts
index f6df37c3cb63..0ea569824c2d 100644
--- a/packages/angular_devkit/core/node/fs.ts
+++ b/packages/angular_devkit/core/node/fs.ts
@@ -1,12 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 import { statSync } from 'fs';
 
+/** @deprecated Since v11.0, unused by the Angular tooling */
 export function isFile(filePath: string): boolean {
   let stat;
   try {
@@ -21,7 +22,7 @@ export function isFile(filePath: string): boolean {
   return stat.isFile() || stat.isFIFO();
 }
 
-
+/** @deprecated Since v11.0, unused by the Angular tooling */
 export function isDirectory(filePath: string): boolean {
   let stat;
   try {
diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index a17b4bde4409..2359f72009a6 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -29,7 +29,7 @@ import {
 
 
 interface ChokidarWatcher {
-  new (options: {}): ChokidarWatcher;
+  new(options: {}): ChokidarWatcher;
 
   add(path: string): ChokidarWatcher;
   on(type: 'change', cb: (path: string) => void): ChokidarWatcher;
@@ -51,7 +51,7 @@ function loadFSWatcher() {
     } 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.');
+          'must be installed in order to use watch() features.');
       }
       throw e;
     }
@@ -92,26 +92,17 @@ export class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
   }
 
   write(path: Path, content: virtualFs.FileBuffer): Observable<void> {
-    return new Observable<void>(obs => {
-      // Create folders if necessary.
-      const _createDir = (path: Path) => {
-        if (fs.existsSync(getSystemPath(path))) {
-          return;
-        }
-        if (dirname(path) === path) {
-          throw new Error();
-        }
-        _createDir(dirname(path));
-        fs.mkdirSync(getSystemPath(path));
-      };
-      _createDir(dirname(path));
-
-      _callFs<void, string, Uint8Array>(
+    return _callFs<void, string, fs.MakeDirectoryOptions>(
+      fs.mkdir,
+      getSystemPath(dirname(path)),
+      { recursive: true },
+    ).pipe(
+      mergeMap(() => _callFs<void, string, Uint8Array>(
         fs.writeFile,
         getSystemPath(path),
         new Uint8Array(content),
-      ).subscribe(obs);
-    });
+      )),
+    );
   }
 
   read(path: Path): Observable<virtualFs.FileBuffer> {
@@ -242,57 +233,30 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
 
   write(path: Path, content: virtualFs.FileBuffer): Observable<void> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        // Create folders if necessary.
-        const _createDir = (path: Path) => {
-          if (fs.existsSync(getSystemPath(path))) {
-            return;
-          }
-          _createDir(dirname(path));
-          fs.mkdirSync(getSystemPath(path));
-        };
-        _createDir(dirname(path));
-        fs.writeFileSync(getSystemPath(path), new Uint8Array(content));
-
-        obs.next();
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      fs.mkdirSync(getSystemPath(dirname(path)), { recursive: true });
+      fs.writeFileSync(getSystemPath(path), new Uint8Array(content));
+      obs.next();
+      obs.complete();
     });
   }
 
   read(path: Path): Observable<virtualFs.FileBuffer> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        const buffer = fs.readFileSync(getSystemPath(path));
+      const buffer = fs.readFileSync(getSystemPath(path));
 
-        obs.next(new Uint8Array(buffer).buffer as virtualFs.FileBuffer);
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      obs.next(new Uint8Array(buffer).buffer as virtualFs.FileBuffer);
+      obs.complete();
     });
   }
 
   delete(path: Path): Observable<void> {
     return this.isDirectory(path).pipe(
       concatMap(isDir => {
-        // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-        // fixed.
         if (isDir) {
           const dirPaths = fs.readdirSync(getSystemPath(path));
           const rmDirComplete = new Observable<void>((obs) => {
-            try {
-              fs.rmdirSync(getSystemPath(path));
-              obs.complete();
-            } catch (e) {
-              obs.error(e);
-            }
+            fs.rmdirSync(getSystemPath(path));
+            obs.complete();
           });
 
           return concat(
@@ -314,69 +278,43 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
 
   rename(from: Path, to: Path): Observable<void> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        const toSystemPath = getSystemPath(to);
-        if (!fs.existsSync(path.dirname(toSystemPath))) {
-            fs.mkdirSync(path.dirname(toSystemPath), { recursive: true });
-        }
-        fs.renameSync(getSystemPath(from), getSystemPath(to));
-        obs.next();
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      const toSystemPath = getSystemPath(to);
+      fs.mkdirSync(path.dirname(toSystemPath), { recursive: true });
+      fs.renameSync(getSystemPath(from), toSystemPath);
+      obs.next();
+      obs.complete();
     });
   }
 
   list(path: Path): Observable<PathFragment[]> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        const names = fs.readdirSync(getSystemPath(path));
-        obs.next(names.map(name => fragment(name)));
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      const names = fs.readdirSync(getSystemPath(path));
+      obs.next(names.map(name => fragment(name)));
+      obs.complete();
     });
   }
 
   exists(path: Path): Observable<boolean> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        obs.next(fs.existsSync(getSystemPath(path)));
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      obs.next(fs.existsSync(getSystemPath(path)));
+      obs.complete();
     });
   }
 
   isDirectory(path: Path): Observable<boolean> {
     // tslint:disable-next-line:no-non-null-assertion
-    return this.stat(path) !.pipe(map(stat => stat.isDirectory()));
+    return this.stat(path)!.pipe(map(stat => stat.isDirectory()));
   }
   isFile(path: Path): Observable<boolean> {
     // tslint:disable-next-line:no-non-null-assertion
-    return this.stat(path) !.pipe(map(stat => stat.isFile()));
+    return this.stat(path)!.pipe(map(stat => stat.isFile()));
   }
 
   // Some hosts may not support stat.
   stat(path: Path): Observable<virtualFs.Stats<fs.Stats>> {
     return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        obs.next(fs.statSync(getSystemPath(path)));
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
+      obs.next(fs.statSync(getSystemPath(path)));
+      obs.complete();
     });
   }
 
diff --git a/packages/angular_devkit/core/node/host_spec.ts b/packages/angular_devkit/core/node/host_spec.ts
index 7ac9615b5db3..a582cce001d7 100644
--- a/packages/angular_devkit/core/node/host_spec.ts
+++ b/packages/angular_devkit/core/node/host_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 3f3e175f4315..390bbdf32740 100644
--- a/packages/angular_devkit/core/node/index.ts
+++ b/packages/angular_devkit/core/node/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/node/testing/index.ts b/packages/angular_devkit/core/node/testing/index.ts
index d8a7dbea4c6b..a6d12e428d89 100644
--- a/packages/angular_devkit/core/node/testing/index.ts
+++ b/packages/angular_devkit/core/node/testing/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
index 0c8c1c52f68d..6f395f81523e 100644
--- a/packages/angular_devkit/core/src/_golden-api.ts
+++ b/packages/angular_devkit/core/src/_golden-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/api.ts b/packages/angular_devkit/core/src/analytics/api.ts
index f538d1ba088a..e1204d516581 100644
--- a/packages/angular_devkit/core/src/analytics/api.ts
+++ b/packages/angular_devkit/core/src/analytics/api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/forwarder.ts b/packages/angular_devkit/core/src/analytics/forwarder.ts
index 8c1ba6de6a92..ec592f449732 100644
--- a/packages/angular_devkit/core/src/analytics/forwarder.ts
+++ b/packages/angular_devkit/core/src/analytics/forwarder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index a6ca6c5f1c00..a35968e78003 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/logging.ts b/packages/angular_devkit/core/src/analytics/logging.ts
index e19785727ffe..55a2ef9ab2ec 100644
--- a/packages/angular_devkit/core/src/analytics/logging.ts
+++ b/packages/angular_devkit/core/src/analytics/logging.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/multi.ts b/packages/angular_devkit/core/src/analytics/multi.ts
index 141f0db38e0b..078019f49959 100644
--- a/packages/angular_devkit/core/src/analytics/multi.ts
+++ b/packages/angular_devkit/core/src/analytics/multi.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/analytics/noop.ts b/packages/angular_devkit/core/src/analytics/noop.ts
index a4592a75c174..b2beb01c008f 100644
--- a/packages/angular_devkit/core/src/analytics/noop.ts
+++ b/packages/angular_devkit/core/src/analytics/noop.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/exception/exception.ts b/packages/angular_devkit/core/src/exception/exception.ts
index 31dc67badb1a..ca587c135646 100644
--- a/packages/angular_devkit/core/src/exception/exception.ts
+++ b/packages/angular_devkit/core/src/exception/exception.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/exception/index.ts b/packages/angular_devkit/core/src/exception/index.ts
index b335f36dcb1d..078e9e1ae344 100644
--- a/packages/angular_devkit/core/src/exception/index.ts
+++ b/packages/angular_devkit/core/src/exception/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental.ts b/packages/angular_devkit/core/src/experimental.ts
index 320138422f53..76a23dec749f 100644
--- a/packages/angular_devkit/core/src/experimental.ts
+++ b/packages/angular_devkit/core/src/experimental.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental/jobs/api.ts b/packages/angular_devkit/core/src/experimental/jobs/api.ts
index 2a5297833cf8..2a1282e2c668 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/api.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 08f381dc081f..0d8dc51cd28a 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
@@ -1,10 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, of } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
diff --git a/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
index c1dce056ed30..c605447301f9 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
@@ -1,10 +1,9 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
diff --git a/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
index 94a12cc53d07..e1aa07873cf4 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental/jobs/exception.ts b/packages/angular_devkit/core/src/experimental/jobs/exception.ts
index 0fcb761a978f..5225bed1b46b 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/exception.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/exception.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
index 4d2fa84dd658..dd2ad71227aa 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental/jobs/index.ts b/packages/angular_devkit/core/src/experimental/jobs/index.ts
index 70210cb22e9f..094fc23877db 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/index.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
index e5594fd0a05d..0df98092c26e 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index 8683f6314171..f4bf4837f15b 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 afae90f2aadf..b36cd587459f 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 48d7443dfcf6..53345bd086c1 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -316,7 +316,7 @@ describe('SimpleScheduler', () => {
         return new Observable<number>(observer => {
           function fn() {
             if (keepGoing) {
-              const p = new Promise(r => resolves.push(r));
+              const p = new Promise<void>(r => resolves.push(r));
 
               observer.next(argument);
               done.push(argument);
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
index aa538dcfb8b7..dd9f29b58025 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 9d49626a2a91..d979d52036bf 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index 2df15fc70f9f..d9f2cef78107 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/index.ts b/packages/angular_devkit/core/src/json/index.ts
index 16bc0d1ff55c..1a1a000c4d2f 100644
--- a/packages/angular_devkit/core/src/json/index.ts
+++ b/packages/angular_devkit/core/src/json/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/interface.ts b/packages/angular_devkit/core/src/json/interface.ts
index 8769239695cf..1b34b8270e5f 100644
--- a/packages/angular_devkit/core/src/json/interface.ts
+++ b/packages/angular_devkit/core/src/json/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/parser.ts b/packages/angular_devkit/core/src/json/parser.ts
index cdf83e20771d..212aa6a2228d 100644
--- a/packages/angular_devkit/core/src/json/parser.ts
+++ b/packages/angular_devkit/core/src/json/parser.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -29,6 +29,7 @@ export class JsonException extends BaseException {}
 
 /**
  * A character was invalid in this context.
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  */
 export class InvalidJsonCharacterException extends JsonException {
   invalidChar: string;
@@ -51,6 +52,7 @@ export class InvalidJsonCharacterException extends JsonException {
 
 /**
  * More input was expected, but we reached the end of the stream.
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  */
 export class UnexpectedEndOfInputException extends JsonException {
   constructor(_context: JsonParserContext) {
@@ -60,6 +62,7 @@ export class UnexpectedEndOfInputException extends JsonException {
 
 /**
  * An error happened within a file.
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  */
 export class PathSpecificJsonException extends JsonException {
   constructor(public path: string, public exception: JsonException) {
@@ -69,6 +72,7 @@ export class PathSpecificJsonException extends JsonException {
 
 /**
  * Context passed around the parser with information about where we currently are in the parse.
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  */
 export interface JsonParserContext {
   position: Position;
@@ -832,6 +836,8 @@ export enum JsonParseMode {
  * Parse the JSON string and return its AST. The AST may be losing data (end comments are
  * discarded for example, and space characters are not represented in the AST), but all values
  * will have a single node in the AST (a 1-to-1 mapping).
+ *
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  * @param input The string to use.
  * @param mode The mode to parse the input with. {@see JsonParseMode}.
  * @returns {JsonAstNode} The root node of the value of the AST.
@@ -863,6 +869,7 @@ export function parseJsonAst(input: string, mode = JsonParseMode.Default): JsonA
 
 /**
  * Options for the parseJson() function.
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  */
 export interface ParseJsonOptions {
   /**
@@ -879,6 +886,7 @@ export interface ParseJsonOptions {
  * 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.
  *
+ * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
  * @param input The string to parse.
  * @param mode The mode to parse the input with. {@see JsonParseMode}.
  * @param options Additional optinos for parsing.
diff --git a/packages/angular_devkit/core/src/json/parser_spec.ts b/packages/angular_devkit/core/src/json/parser_spec.ts
index 56405eb03aed..d8dda771a492 100644
--- a/packages/angular_devkit/core/src/json/parser_spec.ts
+++ b/packages/angular_devkit/core/src/json/parser_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/index.ts b/packages/angular_devkit/core/src/json/schema/index.ts
index 92a977ffe736..8d7df1d10f15 100644
--- a/packages/angular_devkit/core/src/json/schema/index.ts
+++ b/packages/angular_devkit/core/src/json/schema/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index c62f08237d36..ca92ac71abe7 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -105,6 +105,7 @@ export interface PromptDefinition {
 
   raw?: string | JsonObject;
   multiselect?: boolean;
+  propertyTypes: Set<string>;
 }
 
 export type PromptProvider = (definitions: Array<PromptDefinition>)
@@ -112,6 +113,11 @@ export type PromptProvider = (definitions: Array<PromptDefinition>)
 
 export interface SchemaRegistry {
   compile(schema: Object): Observable<SchemaValidator>;
+  /**
+   * @deprecated since 11.2 without replacement.
+   * Producing a flatten schema document does not in all cases produce a schema with identical behavior to the original.
+   * See: https://json-schema.org/draft/2019-09/json-schema-core.html#rfc.appendix.B.2
+   */
   flatten(schema: JsonObject | string): Observable<JsonObject>;
   addFormat(format: SchemaFormat): void;
   addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
diff --git a/packages/angular_devkit/core/src/json/schema/pointer.ts b/packages/angular_devkit/core/src/json/schema/pointer.ts
index 39d054169801..07828e35cb1c 100644
--- a/packages/angular_devkit/core/src/json/schema/pointer.ts
+++ b/packages/angular_devkit/core/src/json/schema/pointer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 b22b26b7a567..e9a57ad3ef74 100644
--- a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index a2f8df45077a..b078de35ef15 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -239,6 +239,9 @@ export class CoreSchemaRegistry implements SchemaRegistry {
    *
    * @param schema The schema or URI to flatten.
    * @returns An Observable of the flattened schema object.
+   * @deprecated since 11.2 without replacement.
+   * Producing a flatten schema document does not in all cases produce a schema with identical behavior to the original.
+   * See: https://json-schema.org/draft/2019-09/json-schema-core.html#rfc.appendix.B.2
    */
   flatten(schema: JsonObject): Observable<JsonObject> {
     this._ajv.removeSchema(schema);
@@ -590,6 +593,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           raw: schema,
           items,
           multiselect,
+          propertyTypes,
           default:
             typeof (parentSchema as JsonObject).default == 'object' &&
             (parentSchema as JsonObject).default !== null &&
@@ -598,10 +602,22 @@ export class CoreSchemaRegistry implements SchemaRegistry {
               : (parentSchema as JsonObject).default as string[],
           async validator(data: JsonValue) {
             try {
-              return await it.self.validate(parentSchema, data);
-            } catch {
-              return false;
+              const result = await it.self.validate(parentSchema, data);
+              // If the schema is sync then false will be returned on validation failure
+              if (result) {
+                return result;
+              } else if (it.self.errors?.length) {
+                // Validation errors will be present on the Ajv instance when sync
+                return it.self.errors[0].message;
+              }
+            } catch (e) {
+              // If the schema is async then an error will be thrown on validation failure
+              if (Array.isArray(e.errors) && e.errors.length) {
+                return e.errors[0].message;
+              }
             }
+
+            return false;
           },
         };
 
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 b5155e75919a..d4ab197dfdd0 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/schema.ts b/packages/angular_devkit/core/src/json/schema/schema.ts
index 13105df66ca0..b7fea3533da4 100644
--- a/packages/angular_devkit/core/src/json/schema/schema.ts
+++ b/packages/angular_devkit/core/src/json/schema/schema.ts
@@ -1,11 +1,10 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { clean } from '../../utils';
 import { JsonObject, JsonValue, isJsonObject } from '../interface';
 
 /**
@@ -27,7 +26,11 @@ export function isJsonSchema(value: unknown): value is JsonSchema {
  * @param schemas All schemas to be merged.
  */
 export function mergeSchemas(...schemas: (JsonSchema | undefined)[]): JsonSchema {
-  return clean(schemas).reduce((prev, curr) => {
+  return schemas.reduce<JsonSchema>((prev, curr) => {
+    if (curr === undefined) {
+      return prev;
+    }
+
     if (prev === false || curr === false) {
       return false;
     } else if (prev === true) {
@@ -45,5 +48,5 @@ export function mergeSchemas(...schemas: (JsonSchema | undefined)[]): JsonSchema
     } else {
       return { ...prev, allOf: [prev, curr] };
     }
-  }, true as JsonSchema);
+  }, true);
 }
diff --git a/packages/angular_devkit/core/src/json/schema/transforms.ts b/packages/angular_devkit/core/src/json/schema/transforms.ts
index 0148b3efb51c..1002c7608a56 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/transforms_spec.ts b/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
index 2e2e5a564a03..2ebf4cb4e5a0 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/utility.ts b/packages/angular_devkit/core/src/json/schema/utility.ts
index 00b4a8278343..ea5b2d8776f6 100644
--- a/packages/angular_devkit/core/src/json/schema/utility.ts
+++ b/packages/angular_devkit/core/src/json/schema/utility.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index 194c29eef4fe..874afc39f4a0 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/json/schema/visitor_spec.ts b/packages/angular_devkit/core/src/json/schema/visitor_spec.ts
index e938ccd56216..c067e5984190 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/indent.ts b/packages/angular_devkit/core/src/logger/indent.ts
index 7eb1958fc855..14c8ed258cf4 100644
--- a/packages/angular_devkit/core/src/logger/indent.ts
+++ b/packages/angular_devkit/core/src/logger/indent.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/indent_spec.ts b/packages/angular_devkit/core/src/logger/indent_spec.ts
index a35ed3307a96..ab95d2f85fbc 100644
--- a/packages/angular_devkit/core/src/logger/indent_spec.ts
+++ b/packages/angular_devkit/core/src/logger/indent_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/index.ts b/packages/angular_devkit/core/src/logger/index.ts
index 63bc0860b0c8..7f2254b5b0d6 100644
--- a/packages/angular_devkit/core/src/logger/index.ts
+++ b/packages/angular_devkit/core/src/logger/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/level.ts b/packages/angular_devkit/core/src/logger/level.ts
index 7de3255d90c5..ce11a2f10a89 100644
--- a/packages/angular_devkit/core/src/logger/level.ts
+++ b/packages/angular_devkit/core/src/logger/level.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/logger.ts b/packages/angular_devkit/core/src/logger/logger.ts
index f684b2427299..c700d0122a80 100644
--- a/packages/angular_devkit/core/src/logger/logger.ts
+++ b/packages/angular_devkit/core/src/logger/logger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/logger_spec.ts b/packages/angular_devkit/core/src/logger/logger_spec.ts
index 50439ca9a452..e04336e996bb 100644
--- a/packages/angular_devkit/core/src/logger/logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/logger_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/null-logger.ts b/packages/angular_devkit/core/src/logger/null-logger.ts
index 4a687840a1c3..ef5df25916ae 100644
--- a/packages/angular_devkit/core/src/logger/null-logger.ts
+++ b/packages/angular_devkit/core/src/logger/null-logger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/null-logger_spec.ts b/packages/angular_devkit/core/src/logger/null-logger_spec.ts
index 52f1936e48f9..858b9a4723d2 100644
--- a/packages/angular_devkit/core/src/logger/null-logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/null-logger_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/transform-logger.ts b/packages/angular_devkit/core/src/logger/transform-logger.ts
index 4d024fd2ffb2..e9589afc2025 100644
--- a/packages/angular_devkit/core/src/logger/transform-logger.ts
+++ b/packages/angular_devkit/core/src/logger/transform-logger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/logger/transform-logger_spec.ts b/packages/angular_devkit/core/src/logger/transform-logger_spec.ts
index d99e2f87269c..8a91872d7e02 100644
--- a/packages/angular_devkit/core/src/logger/transform-logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/transform-logger_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/array.ts b/packages/angular_devkit/core/src/utils/array.ts
index e1969c175723..240d87a04186 100644
--- a/packages/angular_devkit/core/src/utils/array.ts
+++ b/packages/angular_devkit/core/src/utils/array.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/index.ts b/packages/angular_devkit/core/src/utils/index.ts
index 5e6749ee9b95..c5117af9e05d 100644
--- a/packages/angular_devkit/core/src/utils/index.ts
+++ b/packages/angular_devkit/core/src/utils/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/lang.ts b/packages/angular_devkit/core/src/utils/lang.ts
index 032010566a7a..1286a52e2ab6 100644
--- a/packages/angular_devkit/core/src/utils/lang.ts
+++ b/packages/angular_devkit/core/src/utils/lang.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/literals.ts b/packages/angular_devkit/core/src/utils/literals.ts
index bfa16c201c98..b61d88e112f6 100644
--- a/packages/angular_devkit/core/src/utils/literals.ts
+++ b/packages/angular_devkit/core/src/utils/literals.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/literals_spec.ts b/packages/angular_devkit/core/src/utils/literals_spec.ts
index 0883eb685535..83420d1722a0 100644
--- a/packages/angular_devkit/core/src/utils/literals_spec.ts
+++ b/packages/angular_devkit/core/src/utils/literals_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/object.ts b/packages/angular_devkit/core/src/utils/object.ts
index cf6216032069..f377aba9f375 100644
--- a/packages/angular_devkit/core/src/utils/object.ts
+++ b/packages/angular_devkit/core/src/utils/object.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -40,7 +40,7 @@ export function deepCopy<T extends any>(value: T): T {
       return JSON.parse(valueCasted['toJSON']());
     }
 
-    const copy = new (Object.getPrototypeOf(valueCasted).constructor)();
+    const copy = Object.create(Object.getPrototypeOf(valueCasted));
     valueCasted[copySymbol] = copy;
     for (const key of Object.getOwnPropertyNames(valueCasted)) {
       copy[key] = deepCopy(valueCasted[key]);
diff --git a/packages/angular_devkit/core/src/utils/object_spec.ts b/packages/angular_devkit/core/src/utils/object_spec.ts
index 635c783c5f1d..9751c1fd14d3 100644
--- a/packages/angular_devkit/core/src/utils/object_spec.ts
+++ b/packages/angular_devkit/core/src/utils/object_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -50,5 +50,11 @@ describe('object', () => {
       expect(result.b).not.toBe(data1);
       expect(result.b).toBe(result.b.circular.b);
     });
+
+    it('works with null prototype', () => {
+      const data = Object.create(null);
+      data['a'] = 1;
+      expect(deepCopy(data)).toEqual(data);
+    });
   });
 });
diff --git a/packages/angular_devkit/core/src/utils/partially-ordered-set.ts b/packages/angular_devkit/core/src/utils/partially-ordered-set.ts
index 2127f521eef2..f131c4886532 100644
--- a/packages/angular_devkit/core/src/utils/partially-ordered-set.ts
+++ b/packages/angular_devkit/core/src/utils/partially-ordered-set.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/partially-ordered-set_spec.ts b/packages/angular_devkit/core/src/utils/partially-ordered-set_spec.ts
index 31aa667cb54e..da2a5b90bbc7 100644
--- a/packages/angular_devkit/core/src/utils/partially-ordered-set_spec.ts
+++ b/packages/angular_devkit/core/src/utils/partially-ordered-set_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/priority-queue.ts b/packages/angular_devkit/core/src/utils/priority-queue.ts
index 9d5008487d47..faeaf99f88cb 100644
--- a/packages/angular_devkit/core/src/utils/priority-queue.ts
+++ b/packages/angular_devkit/core/src/utils/priority-queue.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/priority-queue_spec.ts b/packages/angular_devkit/core/src/utils/priority-queue_spec.ts
index ef850273de4e..92f41cfbf1bf 100644
--- a/packages/angular_devkit/core/src/utils/priority-queue_spec.ts
+++ b/packages/angular_devkit/core/src/utils/priority-queue_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/strings.ts b/packages/angular_devkit/core/src/utils/strings.ts
index ff3c0ce7cec3..7e8dfc3d970d 100644
--- a/packages/angular_devkit/core/src/utils/strings.ts
+++ b/packages/angular_devkit/core/src/utils/strings.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/utils/template.ts b/packages/angular_devkit/core/src/utils/template.ts
index 1ed86bd81098..b412421b5695 100644
--- a/packages/angular_devkit/core/src/utils/template.ts
+++ b/packages/angular_devkit/core/src/utils/template.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/alias.ts b/packages/angular_devkit/core/src/virtual-fs/host/alias.ts
index 4df9c6b1fbe2..5c03cc365bbf 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/alias.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/alias.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts
index ff852af9910e..e709779f95b4 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/buffer.ts b/packages/angular_devkit/core/src/virtual-fs/host/buffer.ts
index 08a988d25306..20866af9ffaa 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/buffer.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/buffer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/create.ts b/packages/angular_devkit/core/src/virtual-fs/host/create.ts
index 8002f1dea48b..2a4ed479e392 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/create.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/create.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/empty.ts b/packages/angular_devkit/core/src/virtual-fs/host/empty.ts
index 791b27c6e7cf..07291fe2e601 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/empty.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 a795f4209fc6..affdcc3b2fa6 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/index.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/interface.ts b/packages/angular_devkit/core/src/virtual-fs/host/interface.ts
index 9c48e58f5d0d..cdc1ce88b21e 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/interface.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 ca80bc7ea916..a86c625fc949 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 bf9df7a106c9..1768879a6eb2 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/pattern.ts b/packages/angular_devkit/core/src/virtual-fs/host/pattern.ts
index 9880c1e67903..4ce1633b2266 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/pattern.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/pattern.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts
index eb10ea21c1e0..7066b3c090ac 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 899c445d735e..60882c717268 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 2500cc66bb5d..eb3839055923 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/resolver.ts b/packages/angular_devkit/core/src/virtual-fs/host/resolver.ts
index 69c53d642e2f..45d342ecac68 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/resolver.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/resolver.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/safe.ts b/packages/angular_devkit/core/src/virtual-fs/host/safe.ts
index fd4ef719261c..dc92a5150b78 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/safe.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/safe.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/scoped.ts b/packages/angular_devkit/core/src/virtual-fs/host/scoped.ts
index da6e884bc266..b79bbab63b19 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/scoped.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/scoped.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/sync.ts b/packages/angular_devkit/core/src/virtual-fs/host/sync.ts
index cbc8629081cc..2949b3471da9 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/sync.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/sync.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 4e90c409e3c1..945f45098538 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/test.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/test.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 4e0cb296a155..e1f7953252ce 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/index.ts b/packages/angular_devkit/core/src/virtual-fs/index.ts
index 988c3b40d449..353fe31e1e92 100644
--- a/packages/angular_devkit/core/src/virtual-fs/index.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/virtual-fs/path.ts b/packages/angular_devkit/core/src/virtual-fs/path.ts
index d5edd6da300a..fd622bcead09 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 3e66387cd38e..4d7676a0a772 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
index ad5ae8be981f..ec60aff612dd 100644
--- a/packages/angular_devkit/core/src/workspace/core.ts
+++ b/packages/angular_devkit/core/src/workspace/core.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/core_spec.ts b/packages/angular_devkit/core/src/workspace/core_spec.ts
index f92170be2586..5117af8a78f5 100644
--- a/packages/angular_devkit/core/src/workspace/core_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/core_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
index 53b21259116b..719faecdf744 100644
--- a/packages/angular_devkit/core/src/workspace/definitions.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/definitions_spec.ts b/packages/angular_devkit/core/src/workspace/definitions_spec.ts
index 9c640e2f5eb6..511d432e4541 100644
--- a/packages/angular_devkit/core/src/workspace/definitions_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/host.ts b/packages/angular_devkit/core/src/workspace/host.ts
index d9d75c0cf171..316311f3b8a0 100644
--- a/packages/angular_devkit/core/src/workspace/host.ts
+++ b/packages/angular_devkit/core/src/workspace/host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/host_spec.ts b/packages/angular_devkit/core/src/workspace/host_spec.ts
index 079885b60d25..c431300a56e6 100644
--- a/packages/angular_devkit/core/src/workspace/host_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/host_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/index.ts b/packages/angular_devkit/core/src/workspace/index.ts
index 88c1071ae2f7..721f198eae16 100644
--- a/packages/angular_devkit/core/src/workspace/index.ts
+++ b/packages/angular_devkit/core/src/workspace/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/json/metadata.ts b/packages/angular_devkit/core/src/workspace/json/metadata.ts
index bc7d2c58bd5d..61aa7e9a72a2 100644
--- a/packages/angular_devkit/core/src/workspace/json/metadata.ts
+++ b/packages/angular_devkit/core/src/workspace/json/metadata.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/json/reader.ts b/packages/angular_devkit/core/src/workspace/json/reader.ts
index 24c5f34afe74..9d12e86de9bc 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 b6ac75b95971..14c3bf9f83a8 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/json/utilities.ts b/packages/angular_devkit/core/src/workspace/json/utilities.ts
index 151f8202a08f..ce179696038c 100644
--- a/packages/angular_devkit/core/src/workspace/json/utilities.ts
+++ b/packages/angular_devkit/core/src/workspace/json/utilities.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
index 8087d810e5ff..35606f8571a6 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
index 23af2d1c525f..f8c07a4e07de 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index 631c9d4aaab0..835c8c09e77a 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "ora": "5.1.0",
+    "ora": "5.3.0",
     "rxjs": "6.6.3"
   }
 }
diff --git a/packages/angular_devkit/schematics/src/_golden-api.ts b/packages/angular_devkit/schematics/src/_golden-api.ts
index 9d9ea4ddacbe..c9aff4613f4a 100644
--- a/packages/angular_devkit/schematics/src/_golden-api.ts
+++ b/packages/angular_devkit/schematics/src/_golden-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/engine/engine.ts b/packages/angular_devkit/schematics/src/engine/engine.ts
index a3ca4caa515e..696be1233d75 100644
--- a/packages/angular_devkit/schematics/src/engine/engine.ts
+++ b/packages/angular_devkit/schematics/src/engine/engine.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/engine/index.ts b/packages/angular_devkit/schematics/src/engine/index.ts
index 9f8b476cc297..666c8c406df7 100644
--- a/packages/angular_devkit/schematics/src/engine/index.ts
+++ b/packages/angular_devkit/schematics/src/engine/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index dea18164acac..8e003c6bc497 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/engine/schematic.ts b/packages/angular_devkit/schematics/src/engine/schematic.ts
index ba16af352624..134a5ca19b1e 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
index 5f16ed347644..c93aef49bc0a 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/exception/exception.ts b/packages/angular_devkit/schematics/src/exception/exception.ts
index f7f419bfc145..191122ac4e2a 100644
--- a/packages/angular_devkit/schematics/src/exception/exception.ts
+++ b/packages/angular_devkit/schematics/src/exception/exception.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/formats/format-validator.ts b/packages/angular_devkit/schematics/src/formats/format-validator.ts
index 863a5b3e214a..d9881e2b420c 100644
--- a/packages/angular_devkit/schematics/src/formats/format-validator.ts
+++ b/packages/angular_devkit/schematics/src/formats/format-validator.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/formats/html-selector.ts b/packages/angular_devkit/schematics/src/formats/html-selector.ts
index b048482d2eb7..506c20078869 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 411d1df67df9..c39195edd3e2 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/formats/index.ts b/packages/angular_devkit/schematics/src/formats/index.ts
index 2cfab19db670..4586e1b54c86 100644
--- a/packages/angular_devkit/schematics/src/formats/index.ts
+++ b/packages/angular_devkit/schematics/src/formats/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/formats/path.ts b/packages/angular_devkit/schematics/src/formats/path.ts
index 0c854957f15a..c804a1540dea 100644
--- a/packages/angular_devkit/schematics/src/formats/path.ts
+++ b/packages/angular_devkit/schematics/src/formats/path.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/formats/path_spec.ts b/packages/angular_devkit/schematics/src/formats/path_spec.ts
index 24901f08a72f..e0e923716dbb 100644
--- a/packages/angular_devkit/schematics/src/formats/path_spec.ts
+++ b/packages/angular_devkit/schematics/src/formats/path_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/index.ts b/packages/angular_devkit/schematics/src/index.ts
index d0951eb363ad..acb6f8aaa91a 100644
--- a/packages/angular_devkit/schematics/src/index.ts
+++ b/packages/angular_devkit/schematics/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index d5c390026145..c5236461203d 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/base_spec.ts b/packages/angular_devkit/schematics/src/rules/base_spec.ts
index 3f199ab9dbef..e414cf8ec0ad 100644
--- a/packages/angular_devkit/schematics/src/rules/base_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/base_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index a9f2762e3c96..9927c8cdcab5 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/call_spec.ts b/packages/angular_devkit/schematics/src/rules/call_spec.ts
index b4ec2d4b43e5..a6a320aff257 100644
--- a/packages/angular_devkit/schematics/src/rules/call_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/call_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/move.ts b/packages/angular_devkit/schematics/src/rules/move.ts
index 211d00f01837..11245bffbd69 100644
--- a/packages/angular_devkit/schematics/src/rules/move.ts
+++ b/packages/angular_devkit/schematics/src/rules/move.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/move_spec.ts b/packages/angular_devkit/schematics/src/rules/move_spec.ts
index 96bfcc896331..596b8cc11348 100644
--- a/packages/angular_devkit/schematics/src/rules/move_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/move_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/random.ts b/packages/angular_devkit/schematics/src/rules/random.ts
index a2575f57a5b0..d4971b155041 100644
--- a/packages/angular_devkit/schematics/src/rules/random.ts
+++ b/packages/angular_devkit/schematics/src/rules/random.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/rename.ts b/packages/angular_devkit/schematics/src/rules/rename.ts
index 2405d5302273..06b3b09fd786 100644
--- a/packages/angular_devkit/schematics/src/rules/rename.ts
+++ b/packages/angular_devkit/schematics/src/rules/rename.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/rename_spec.ts b/packages/angular_devkit/schematics/src/rules/rename_spec.ts
index c9fdda3cdd4a..e2c7f027e001 100644
--- a/packages/angular_devkit/schematics/src/rules/rename_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/rename_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/schematic.ts b/packages/angular_devkit/schematics/src/rules/schematic.ts
index ce4421b42848..86220ab39e27 100644
--- a/packages/angular_devkit/schematics/src/rules/schematic.ts
+++ b/packages/angular_devkit/schematics/src/rules/schematic.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -29,7 +29,14 @@ export function externalSchematic<OptionT extends object>(
     const collection = context.engine.createCollection(collectionName, context.schematic.collection);
     const schematic = collection.createSchematic(schematicName);
 
-    return schematic.call(options, observableOf(branch(input)), context, executionOptions);
+    return schematic.call(options, observableOf(branch(input)), context, executionOptions).pipe(
+      last(),
+      map(x => {
+        input.merge(x, MergeStrategy.AllowOverwriteConflict);
+
+        return input;
+      }),
+    );
   };
 }
 
diff --git a/packages/angular_devkit/schematics/src/rules/template.ts b/packages/angular_devkit/schematics/src/rules/template.ts
index 5b34acf90444..173e2b089f76 100644
--- a/packages/angular_devkit/schematics/src/rules/template.ts
+++ b/packages/angular_devkit/schematics/src/rules/template.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/template_spec.ts b/packages/angular_devkit/schematics/src/rules/template_spec.ts
index 56e99f9a90dd..63df3ef7bab9 100644
--- a/packages/angular_devkit/schematics/src/rules/template_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/template_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/rules/url.ts b/packages/angular_devkit/schematics/src/rules/url.ts
index 027bf62a4f90..1d6e96ae6224 100644
--- a/packages/angular_devkit/schematics/src/rules/url.ts
+++ b/packages/angular_devkit/schematics/src/rules/url.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/sink/dryrun.ts b/packages/angular_devkit/schematics/src/sink/dryrun.ts
index b17ddff12aa9..e99b9f04673a 100644
--- a/packages/angular_devkit/schematics/src/sink/dryrun.ts
+++ b/packages/angular_devkit/schematics/src/sink/dryrun.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts b/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
index 9f624137865e..a297d19c874e 100644
--- a/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
+++ b/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/sink/host.ts b/packages/angular_devkit/schematics/src/sink/host.ts
index aa498ea2a60a..edf51e40fc90 100644
--- a/packages/angular_devkit/schematics/src/sink/host.ts
+++ b/packages/angular_devkit/schematics/src/sink/host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/sink/host_spec.ts b/packages/angular_devkit/schematics/src/sink/host_spec.ts
index 8ad2ef8c8cbb..9694d5a002ae 100644
--- a/packages/angular_devkit/schematics/src/sink/host_spec.ts
+++ b/packages/angular_devkit/schematics/src/sink/host_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/sink/sink.ts b/packages/angular_devkit/schematics/src/sink/sink.ts
index fe0c2d5adff6..eea80de2fab8 100644
--- a/packages/angular_devkit/schematics/src/sink/sink.ts
+++ b/packages/angular_devkit/schematics/src/sink/sink.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/action.ts b/packages/angular_devkit/schematics/src/tree/action.ts
index 30dace1305db..61839a916325 100644
--- a/packages/angular_devkit/schematics/src/tree/action.ts
+++ b/packages/angular_devkit/schematics/src/tree/action.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/action_spec.ts b/packages/angular_devkit/schematics/src/tree/action_spec.ts
index 20c76278a026..155308aa8503 100644
--- a/packages/angular_devkit/schematics/src/tree/action_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/action_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/common_spec.ts b/packages/angular_devkit/schematics/src/tree/common_spec.ts
index 141a744a24a6..13f5bc1bfa7b 100644
--- a/packages/angular_devkit/schematics/src/tree/common_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/common_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/delegate.ts b/packages/angular_devkit/schematics/src/tree/delegate.ts
index 5e51ac7b1547..a7514cb8fd83 100644
--- a/packages/angular_devkit/schematics/src/tree/delegate.ts
+++ b/packages/angular_devkit/schematics/src/tree/delegate.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/empty.ts b/packages/angular_devkit/schematics/src/tree/empty.ts
index 04f598841368..1447855c3fe2 100644
--- a/packages/angular_devkit/schematics/src/tree/empty.ts
+++ b/packages/angular_devkit/schematics/src/tree/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/entry.ts b/packages/angular_devkit/schematics/src/tree/entry.ts
index a4dd2c02d723..d37077d41657 100644
--- a/packages/angular_devkit/schematics/src/tree/entry.ts
+++ b/packages/angular_devkit/schematics/src/tree/entry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/host-tree.ts b/packages/angular_devkit/schematics/src/tree/host-tree.ts
index eab9c9d3809c..ef897fa93a68 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,7 +10,6 @@ import {
   PathFragment,
   PathIsDirectoryException,
   PathIsFileException,
-  clean,
   dirname,
   join,
   normalize,
@@ -33,6 +32,7 @@ import {
   OverwriteFileAction,
   RenameFileAction,
 } from './action';
+import { DelegateTree } from './delegate';
 import { LazyFileEntry } from './entry';
 import {
   DirEntry,
@@ -46,6 +46,7 @@ import {
   UpdateRecorder,
 } from './interface';
 import { UpdateRecorderBase } from './recorder';
+import { ScopedTree } from './scoped';
 
 
 let _uniqueId = 0;
@@ -57,7 +58,7 @@ export class HostDirEntry implements DirEntry {
     readonly path: Path,
     protected _host: virtualFs.SyncDelegateHost,
     protected _tree: Tree,
-  ) {}
+  ) { }
 
   get subdirs(): PathFragment[] {
     return this._host.list(this.path)
@@ -157,13 +158,27 @@ export class HostTree implements Tree {
     return branchedTree;
   }
 
+  private isAncestorOf(tree: Tree): boolean {
+    if (tree instanceof HostTree) {
+      return tree._ancestry.has(this._id);
+    }
+    if (tree instanceof DelegateTree) {
+      return this.isAncestorOf((tree as unknown as { _other: Tree})._other);
+    }
+    if (tree instanceof ScopedTree) {
+      return this.isAncestorOf((tree as unknown as { _base: Tree})._base);
+    }
+
+    return false;
+  }
+
   merge(other: Tree, strategy: MergeStrategy = MergeStrategy.Default): void {
     if (other === this) {
       // Merging with yourself? Tsk tsk. Nothing to do at least.
       return;
     }
 
-    if (other instanceof HostTree && other._ancestry.has(this._id)) {
+    if (this.isAncestorOf(other)) {
       // Workaround for merging a branch back into one of its ancestors
       // More complete branch point tracking is required to avoid
       strategy |= MergeStrategy.Overwrite;
@@ -174,14 +189,14 @@ export class HostTree implements Tree {
     const overwriteConflictAllowed =
       (strategy & MergeStrategy.AllowOverwriteConflict) == MergeStrategy.AllowOverwriteConflict;
     const deleteConflictAllowed =
-      (strategy & MergeStrategy.AllowOverwriteConflict) == MergeStrategy.AllowDeleteConflict;
+      (strategy & MergeStrategy.AllowDeleteConflict) == MergeStrategy.AllowDeleteConflict;
 
     other.actions.forEach(action => {
       switch (action.kind) {
         case 'c': {
           const { path, content } = action;
 
-          if ((this._willCreate(path) || this._willOverwrite(path))) {
+          if (this._willCreate(path) || this._willOverwrite(path) || this.exists(path)) {
             const existingContent = this.read(path);
             if (existingContent && content.equals(existingContent)) {
               // Identical outcome; no action required
@@ -369,52 +384,53 @@ export class HostTree implements Tree {
   apply(action: Action, strategy?: MergeStrategy): void {
     throw new SchematicsException('Apply not implemented on host trees.');
   }
+
+  private *generateActions(): Iterable<Action> {
+    for (const record of this._record.records()) {
+      switch (record.kind) {
+        case 'create':
+          yield {
+            id: this._id,
+            parent: 0,
+            kind: 'c',
+            path: record.path,
+            content: Buffer.from(record.content),
+          } as CreateFileAction;
+          break;
+        case 'overwrite':
+          yield {
+            id: this._id,
+            parent: 0,
+            kind: 'o',
+            path: record.path,
+            content: Buffer.from(record.content),
+          } as OverwriteFileAction;
+          break;
+        case 'rename':
+          yield {
+            id: this._id,
+            parent: 0,
+            kind: 'r',
+            path: record.from,
+            to: record.to,
+          } as RenameFileAction;
+          break;
+        case 'delete':
+          yield {
+            id: this._id,
+            parent: 0,
+            kind: 'd',
+            path: record.path,
+          } as DeleteFileAction;
+          break;
+      }
+    }
+  }
+
   get actions(): Action[] {
     // Create a list of all records until we hit our original backend. This is to support branches
     // that diverge from each others.
-    const allRecords = [...this._record.records()];
-
-    return clean(
-      allRecords
-        .map(record => {
-          switch (record.kind) {
-            case 'create':
-              return {
-                id: this._id,
-                parent: 0,
-                kind: 'c',
-                path: record.path,
-                content: Buffer.from(record.content),
-              } as CreateFileAction;
-            case 'overwrite':
-              return {
-                id: this._id,
-                parent: 0,
-                kind: 'o',
-                path: record.path,
-                content: Buffer.from(record.content),
-              } as OverwriteFileAction;
-            case 'rename':
-              return {
-                id: this._id,
-                parent: 0,
-                kind: 'r',
-                path: record.from,
-                to: record.to,
-              } as RenameFileAction;
-            case 'delete':
-              return {
-                id: this._id,
-                parent: 0,
-                kind: 'd',
-                path: record.path,
-              } as DeleteFileAction;
-
-            default:
-              return;
-          }
-        }),
-    );
+    return Array.from(this.generateActions());
   }
 }
 
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 476046d6c88b..f66e918eba52 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
@@ -1,15 +1,53 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { FilterHostTree, HostTree } from './host-tree';
+import { MergeStrategy } from './interface';
 
 describe('HostTree', () => {
+  describe('merge', () => {
+    it('should create files from each tree', () => {
+      const tree = new HostTree();
+      tree.create('/file1', 'a');
+      const tree2 = new HostTree();
+      tree2.create('/file2', 'a');
+      tree.merge(tree2);
+      expect(tree.actions[0].kind).toEqual('c');
+      expect(tree.actions[1].kind).toEqual('c');
+    });
+
+    it('should overwrite if the file exists in one tree', () => {
+      const tree = new HostTree();
+      tree.create('/file1', 'a');
+      const tree2 = new HostTree();
+      tree2.create('/file1', 'b');
+      tree.merge(tree2, MergeStrategy.Overwrite);
+      expect(tree.actions[0].kind).toEqual('c');
+    });
 
+    it('should throw if the file exists in one tree with the correct MergeStrategy', () => {
+      const tree = new HostTree();
+      tree.create('/file1', 'a');
+      const tree2 = new HostTree();
+      tree2.create('/file1', 'b');
+      expect(() => tree.merge(tree2)).toThrow();
+    });
+
+    it('should not have a second action if the file content is the same', () => {
+      const tree = new HostTree();
+      tree.create('/file1', 'a');
+      const tree2 = new HostTree();
+      tree2.create('/file1', 'a');
+      tree.merge(tree2, MergeStrategy.Overwrite);
+      expect(tree.actions[0].kind).toEqual('c');
+      expect(tree.actions.length).toEqual(1);
+    });
+  });
 });
 
 describe('FilterHostTree', () => {
diff --git a/packages/angular_devkit/schematics/src/tree/interface.ts b/packages/angular_devkit/schematics/src/tree/interface.ts
index df763916b351..5895e89101b6 100644
--- a/packages/angular_devkit/schematics/src/tree/interface.ts
+++ b/packages/angular_devkit/schematics/src/tree/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/null.ts b/packages/angular_devkit/schematics/src/tree/null.ts
index cd0a9ba535d4..ae4243baa809 100644
--- a/packages/angular_devkit/schematics/src/tree/null.ts
+++ b/packages/angular_devkit/schematics/src/tree/null.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/recorder.ts b/packages/angular_devkit/schematics/src/tree/recorder.ts
index 8b18b8182e55..a01d0830357e 100644
--- a/packages/angular_devkit/schematics/src/tree/recorder.ts
+++ b/packages/angular_devkit/schematics/src/tree/recorder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/recorder_spec.ts b/packages/angular_devkit/schematics/src/tree/recorder_spec.ts
index 0840191ceb1c..c16b32182ad2 100644
--- a/packages/angular_devkit/schematics/src/tree/recorder_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/recorder_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/scoped.ts b/packages/angular_devkit/schematics/src/tree/scoped.ts
index e503d76878f1..8fdcaaf71d1e 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
index 35fb3ae3a83e..e6272606e3db 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/tree/static.ts b/packages/angular_devkit/schematics/src/tree/static.ts
index 516169abee24..72852cc062c0 100644
--- a/packages/angular_devkit/schematics/src/tree/static.ts
+++ b/packages/angular_devkit/schematics/src/tree/static.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/utility/linked-list.ts b/packages/angular_devkit/schematics/src/utility/linked-list.ts
index 39b57a4a69ab..1b8a6ff39593 100644
--- a/packages/angular_devkit/schematics/src/utility/linked-list.ts
+++ b/packages/angular_devkit/schematics/src/utility/linked-list.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/utility/update-buffer.ts b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
index 4389f8ab2471..b7eade1c0242 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 64e650feeb29..cd0ec2f924ef 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index 54d58d00e08f..5ff40f58cd77 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/workflow/index.ts b/packages/angular_devkit/schematics/src/workflow/index.ts
index bec7bf5d64d4..3abed265b609 100644
--- a/packages/angular_devkit/schematics/src/workflow/index.ts
+++ b/packages/angular_devkit/schematics/src/workflow/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/src/workflow/interface.ts b/packages/angular_devkit/schematics/src/workflow/interface.ts
index 01de696707ce..d40560ae3d89 100644
--- a/packages/angular_devkit/schematics/src/workflow/interface.ts
+++ b/packages/angular_devkit/schematics/src/workflow/interface.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/index.ts b/packages/angular_devkit/schematics/tasks/index.ts
index 893b35b83e4a..9e41b28127ae 100644
--- a/packages/angular_devkit/schematics/tasks/index.ts
+++ b/packages/angular_devkit/schematics/tasks/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/node/index.ts b/packages/angular_devkit/schematics/tasks/node/index.ts
index d711d291803b..a712d36b5ea6 100644
--- a/packages/angular_devkit/schematics/tasks/node/index.ts
+++ b/packages/angular_devkit/schematics/tasks/node/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/executor.ts b/packages/angular_devkit/schematics/tasks/package-manager/executor.ts
index bbfc8b469813..83edf99fc67f 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/executor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -105,7 +105,7 @@ export default function(
 
     return new Observable(obs => {
       const spinner = ora({
-        text: 'Installing packages...',
+        text: `Installing packages (${taskPackageManagerName})...`,
         // Workaround for https://github.com/sindresorhus/ora/issues/136.
         discardStdin: process.platform != 'win32',
       }).start();
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts b/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts
index 719ff80c40be..b94ee64e65cb 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,13 +8,12 @@
 import { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { NodePackageName, NodePackageTaskOptions } from './options';
 
-// TODO: This should be an interface but that would change the public API
-export class NodePackageInstallTaskOptions {
-  packageManager!: string;
-  packageName!: string;
-  workingDirectory!: string;
-  quiet!: boolean;
-  hideOutput!: boolean;
+interface NodePackageInstallTaskOptions {
+  packageManager?: string;
+  packageName?: string;
+  workingDirectory?: string;
+  quiet?: boolean;
+  hideOutput?: boolean;
 }
 
 export class NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
@@ -25,8 +24,8 @@ export class NodePackageInstallTask implements TaskConfigurationGenerator<NodePa
   packageName?: string;
 
   constructor(workingDirectory?: string);
-  constructor(options: Partial<NodePackageInstallTaskOptions>);
-  constructor(options?: string | Partial<NodePackageInstallTaskOptions>) {
+  constructor(options: NodePackageInstallTaskOptions);
+  constructor(options?: string | NodePackageInstallTaskOptions) {
     if (typeof options === 'string') {
       this.workingDirectory = options;
     } else if (typeof options === 'object') {
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts b/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts
index 900a47f9ff20..b28fa3188b45 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/options.ts b/packages/angular_devkit/schematics/tasks/package-manager/options.ts
index e9a665424d90..4864730dcce3 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/options.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/repo-init/executor.ts b/packages/angular_devkit/schematics/tasks/repo-init/executor.ts
index de1ef00933f2..98cfc45f038d 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/executor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/repo-init/init-task.ts b/packages/angular_devkit/schematics/tasks/repo-init/init-task.ts
index df2a2888d4bd..882fc1910863 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/init-task.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/init-task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/repo-init/options.ts b/packages/angular_devkit/schematics/tasks/repo-init/options.ts
index 8153764058f8..3654a1aef7d2 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/options.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts b/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts
index 4aae9a071c8e..4b552aeb0d86 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/options.ts b/packages/angular_devkit/schematics/tasks/run-schematic/options.ts
index a7d90f632755..9eec38b0e27d 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/options.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/task.ts b/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
index b8f17d307802..38e7bbcee5e2 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
index 793b19a5756f..8294cb239ec7 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts
index a25497ec6a50..05c6348c9f1c 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts
index 5071dc305c8e..9dd50ebc1770 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts
index 12ad5c4e1e20..72d17206e14a 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/test/custom-rule.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/test/custom-rule.ts
index d8c233911864..560a7c5d3113 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/test/custom-rule.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/test/custom-rule.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/test/rules/customRuleRule.js b/packages/angular_devkit/schematics/tasks/tslint-fix/test/rules/customRuleRule.js
index 68c4882e0f5a..b7daabdd10cb 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/test/rules/customRuleRule.js
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/test/rules/customRuleRule.js
@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/test/run-task.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/test/run-task.ts
index 571c08d978e3..7d62d8041887 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/test/run-task.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/test/run-task.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/testing/index.ts b/packages/angular_devkit/schematics/testing/index.ts
index 05ba43117ca3..3c315c83bbbf 100644
--- a/packages/angular_devkit/schematics/testing/index.ts
+++ b/packages/angular_devkit/schematics/testing/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
index bae056e799f4..a5c21fafc188 100644
--- a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
+++ b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/description.ts b/packages/angular_devkit/schematics/tools/description.ts
index 52ee09d13f7c..02d8d21cc64c 100644
--- a/packages/angular_devkit/schematics/tools/description.ts
+++ b/packages/angular_devkit/schematics/tools/description.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/export-ref.ts b/packages/angular_devkit/schematics/tools/export-ref.ts
index a4bf7b89e759..3318f4109946 100644
--- a/packages/angular_devkit/schematics/tools/export-ref.ts
+++ b/packages/angular_devkit/schematics/tools/export-ref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/export-ref_spec.ts b/packages/angular_devkit/schematics/tools/export-ref_spec.ts
index d522df6db103..8a7022181435 100644
--- a/packages/angular_devkit/schematics/tools/export-ref_spec.ts
+++ b/packages/angular_devkit/schematics/tools/export-ref_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -39,7 +39,8 @@ describe('ExportStringRef', () => {
     expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'export-ref'));
   });
 
-  it('works on package names', () => {
+  // the below doesn't work under Bazel
+  xit('works on package names', () => {
     // META
     const ref = new ExportStringRef(
       '@angular-devkit/schematics/tools#CollectionCannotBeResolvedException',
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
index d6d0c61eeb22..3e516dd6a54b 100644
--- a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 9f26ba505118..c49a24fcef46 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,7 +10,6 @@ import {
   InvalidJsonCharacterException,
   JsonObject,
   UnexpectedEndOfInputException,
-  isPromise,
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
@@ -21,10 +20,8 @@ import {
   Observable,
   from as observableFrom,
   isObservable,
-  of as observableOf,
   throwError,
 } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
 import { Url } from 'url';
 import {
   HostCreateTree,
@@ -301,20 +298,17 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     options: OptionT,
     context?: FileSystemSchematicContext,
   ): Observable<ResultT> {
-    // 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);
-          if (isObservable(newOptions)) {
-            return newOptions;
-          } else if (isPromise(newOptions)) {
-            return observableFrom(newOptions);
-          } else {
-            return observableOf(newOptions);
-          }
-        })),
-      )) as {} as Observable<ResultT>;
+    const transform = async () => {
+      let transformedOptions = options;
+      for (const transformer of this._transforms) {
+        const transformerResult = transformer(schematic, transformedOptions, context);
+        transformedOptions = await (isObservable(transformerResult) ? transformerResult.toPromise() : transformerResult);
+      }
+
+      return transformedOptions;
+    };
+
+    return observableFrom(transform()) as unknown as Observable<ResultT>;
   }
 
   transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext {
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 3b200afe7a05..6daa5ebccfc6 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 905525e2aa79..c1afc276dfc8 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/file-system-utility.ts b/packages/angular_devkit/schematics/tools/file-system-utility.ts
index 06784b347254..bde14f3fa303 100644
--- a/packages/angular_devkit/schematics/tools/file-system-utility.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-utility.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/index.ts b/packages/angular_devkit/schematics/tools/index.ts
index 97c7b85d7338..2521569485c4 100644
--- a/packages/angular_devkit/schematics/tools/index.ts
+++ b/packages/angular_devkit/schematics/tools/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 df203880699c..f5b2d2d5fec3 100644
--- a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index 7e02d9ff585e..0e2d0be19ade 100644
--- a/packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/node-modules-test-engine-host.ts b/packages/angular_devkit/schematics/tools/node-modules-test-engine-host.ts
index a2b336695287..a7e421c97cab 100644
--- a/packages/angular_devkit/schematics/tools/node-modules-test-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/node-modules-test-engine-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/schema-option-transform.ts b/packages/angular_devkit/schematics/tools/schema-option-transform.ts
index 1c7491ecb60a..0a5b6345840f 100644
--- a/packages/angular_devkit/schematics/tools/schema-option-transform.ts
+++ b/packages/angular_devkit/schematics/tools/schema-option-transform.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index f791c8522f04..825bb725165e 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -12,6 +12,7 @@ import {
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
+import { OptionTransform } from '../file-system-engine-host-base';
 import { NodeModulesEngineHost } from '../node-module-engine-host';
 import { validateOptionsWithSchema } from '../schema-option-transform';
 
@@ -23,6 +24,8 @@ export interface NodeWorkflowOptions {
   registry?: schema.CoreSchemaRegistry;
   resolvePaths?: string[];
   schemaValidation?: boolean;
+  optionTransforms?: OptionTransform<object, object>[];
+  engineHostCreator?: (options: NodeWorkflowOptions) => NodeModulesEngineHost;
 }
 
 /**
@@ -44,7 +47,8 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
       root = options.root;
     }
 
-    const engineHost = new NodeModulesEngineHost(options.resolvePaths);
+    const engineHost =
+      options.engineHostCreator?.(options) || new NodeModulesEngineHost(options.resolvePaths);
     super({
       host,
       engineHost,
@@ -66,6 +70,12 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
     engineHost.registerTaskExecutor(BuiltinTaskExecutor.RunSchematic);
     engineHost.registerTaskExecutor(BuiltinTaskExecutor.TslintFix);
 
+    if (options.optionTransforms) {
+      for (const transform of options.optionTransforms) {
+        engineHost.registerOptionsTransform(transform);
+      }
+    }
+
     if (options.schemaValidation) {
       engineHost.registerOptionsTransform(validateOptionsWithSchema(this.registry));
     }
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..539e24ee9fce 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics_cli/README.md b/packages/angular_devkit/schematics_cli/README.md
new file mode 100644
index 000000000000..677fb468f631
--- /dev/null
+++ b/packages/angular_devkit/schematics_cli/README.md
@@ -0,0 +1,49 @@
+# Schematics CLI
+
+This package contains the executable for running a [Schematic](/packages/angular_devkit/schematics/README.md).
+
+# Usage
+
+```
+$ 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).
+
+    --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
+                        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: '@angular-devkit/schematics-cli:'.
+
+    --no-interactive    Disables interactive input prompts.
+
+    --verbose           Show more information.
+
+    --help              Show this message.
+
+Any additional option is passed to the Schematics depending on its schema.
+```
+
+# Examples
+
+1. Create a new NPM package that contains a blank schematic.
+
+```sh
+$ schematics blank <name>
+```
+
+2. Walkthrough example that demonstrates how to build a schematic.
+
+```sh
+$ schematics schematic --name <name>
+```
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 5a15347ad034..9b4f8098d1c7 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -38,7 +38,10 @@ function parseSchematicName(str: string | null): { collection: string, schematic
 
   let schematic = str;
   if (schematic && schematic.indexOf(':') != -1) {
-    [collection, schematic] = schematic.split(':', 2);
+    [collection, schematic] = [
+      schematic.slice(0, schematic.lastIndexOf(':')),
+      schematic.substring(schematic.lastIndexOf(':') + 1),
+    ];
   }
 
   return { collection, schematic };
@@ -233,7 +236,7 @@ export async function main({
   /**
    * Remove every options from argv that we support in schematics itself.
    */
-  const parsedArgs = Object.assign({}, argv);
+  const parsedArgs = Object.assign({}, argv) as Record<string, unknown>;
   delete parsedArgs['--'];
   for (const key of booleanArgs) {
     delete parsedArgs[key];
@@ -259,7 +262,7 @@ export async function main({
     }
   });
 
-  parsedArgs._  = [];
+  delete parsedArgs._;
 
   // Add prompts.
   if (argv['interactive'] && isTTY()) {
@@ -336,7 +339,7 @@ function getUsage(): string {
 
       --help              Show this message.
 
-  Any additional option is passed to the Schematics depending on
+  Any additional option is passed to the Schematics depending on its schema.
   `;
 }
 
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
index 1955aac0777f..3c71096915c6 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 610d18baf8db..26cfa63d0c3f 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",
     "ansi-colors": "4.1.1",
     "inquirer": "7.3.3",
-    "minimist": "1.2.5",
-    "symbol-observable": "2.0.3"
+    "minimist": "1.2.6",
+    "symbol-observable": "3.0.0"
   }
 }
diff --git a/packages/ngtools/webpack/README.md b/packages/ngtools/webpack/README.md
index f16bfcd50994..c656a4b78904 100644
--- a/packages/ngtools/webpack/README.md
+++ b/packages/ngtools/webpack/README.md
@@ -63,6 +63,8 @@ The loader works with webpack plugin to compile your TypeScript. It's important
 * `i18nOutFile`. Optional and only used for View Engine compilations. The name of the file to write extractions to.
 * `i18nOutFormat`. Optional and only used for View Engine compilations. The format of the localization file where extractions will be written to.
 * `locale`. Optional and only used for View Engine compilations. Locale to use for i18n.
+* `suppressZoneJsIncompatibilityWarning`. Optional, defaults to `false`. A Zone.js incompatibility warning is shown when the compilation target is ES2017+. 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.
 
 ## 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/package.json b/packages/ngtools/webpack/package.json
index 26cb94994f71..3307e73acd34 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -22,18 +22,18 @@
   "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "enhanced-resolve": "5.2.0",
-    "webpack-sources": "2.0.1"
+    "enhanced-resolve": "5.7.0",
+    "webpack-sources": "2.2.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^11.0.0 || ^11.0.0-next",
-    "typescript": ">=3.9 < 4.1",
+    "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+    "typescript": "~4.0.0 || ~4.1.0",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "11.0.0-next.6",
-    "@angular/compiler-cli": "11.0.0-next.6",
-    "typescript": "4.0.3",
+    "@angular/compiler": "11.2.0-next.0",
+    "@angular/compiler-cli": "11.2.0-next.0",
+    "typescript": "4.1.5",
     "webpack": "4.44.2"
   }
 }
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index f827ee38a155..31df7666e6e1 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -179,14 +179,14 @@ export class AngularCompilerPlugin {
     }
 
     // Parse the tsconfig contents.
-    const config = readConfiguration(this._tsConfigPath);
-    if (config.errors && config.errors.length) {
-      throw new Error(formatDiagnostics(config.errors));
+    const { errors, rootNames, options: compilerOptions } = readConfiguration(this._tsConfigPath, options.compilerOptions);
+    if (errors && errors.length) {
+      throw new Error(formatDiagnostics(errors));
     }
 
-    this._rootNames = config.rootNames;
-    this._compilerOptions = { ...config.options, ...options.compilerOptions };
-    this._basePath = config.options.basePath || basePath || '';
+    this._rootNames = rootNames;
+    this._compilerOptions = compilerOptions;
+    this._basePath = compilerOptions.basePath || basePath || '';
 
     // Overwrite outDir so we can find generated files next to their .ts origin in compilerHost.
     this._compilerOptions.outDir = '';
@@ -269,6 +269,18 @@ export class AngularCompilerPlugin {
       this._discoverLazyRoutes = options.discoverLazyRoutes;
     }
 
+    if (
+      !this.options.suppressZoneJsIncompatibilityWarning &&
+      this._compilerOptions.target !== undefined &&
+      this._compilerOptions.target >= ts.ScriptTarget.ES2017
+    ) {
+      this._warnings.push(
+        'Zone.js does not support native async/await in ES2017+.\n' +
+        'These blocks are not intercepted by zone.js and will not triggering change detection.\n' +
+        'See: https://github.com/angular/zone.js/pull/1140 for more information.',
+      );
+    }
+
     if (this._discoverLazyRoutes === false && this.options.additionalLazyModuleResources
       && this.options.additionalLazyModuleResources.length > 0) {
       this._warnings.push(
@@ -773,21 +785,14 @@ export class AngularCompilerPlugin {
 
       let ngccProcessor: NgccProcessor | undefined;
       if (this._compilerOptions.enableIvy) {
-        const fileWatchPurger = (path: string) => {
-          // tslint:disable-next-line: no-any
-          if ((compilerWithFileSystems.inputFileSystem as any).purge) {
-            // tslint:disable-next-line: no-any
-            (compilerWithFileSystems.inputFileSystem as any).purge(path);
-          }
-        };
-
         ngccProcessor = new NgccProcessor(
           this._mainFields,
-          fileWatchPurger,
           this._warnings,
           this._errors,
           this._basePath,
           this._tsConfigPath,
+          compilerWithFileSystems.inputFileSystem,
+          compiler.options.resolve?.symlinks,
         );
 
         ngccProcessor.process();
diff --git a/packages/ngtools/webpack/src/benchmark.ts b/packages/ngtools/webpack/src/benchmark.ts
index b54f5d39f5fb..5b7528a7e0fd 100644
--- a/packages/ngtools/webpack/src/benchmark.ts
+++ b/packages/ngtools/webpack/src/benchmark.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 302670628b79..5be172ff7268 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/diagnostics.ts b/packages/ngtools/webpack/src/diagnostics.ts
index 674aecb7a657..3104fdb5a84c 100644
--- a/packages/ngtools/webpack/src/diagnostics.ts
+++ b/packages/ngtools/webpack/src/diagnostics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/entry_resolver.ts b/packages/ngtools/webpack/src/entry_resolver.ts
index 0f0fa51051a9..cfbd81863dac 100644
--- a/packages/ngtools/webpack/src/entry_resolver.ts
+++ b/packages/ngtools/webpack/src/entry_resolver.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/index.ts b/packages/ngtools/webpack/src/index.ts
index bba971febb90..be4850ac5a41 100644
--- a/packages/ngtools/webpack/src/index.ts
+++ b/packages/ngtools/webpack/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,3 +14,5 @@ export const NgToolsLoader = __filename;
 
 // We shouldn't need to export this, but webpack-rollup-loader uses it.
 export type { VirtualFileSystemDecorator } from './virtual_file_system_decorator';
+
+export * as ivy from './ivy';
diff --git a/packages/ngtools/webpack/src/interfaces.ts b/packages/ngtools/webpack/src/interfaces.ts
index 09a0c3772a16..3bb9dddedb97 100644
--- a/packages/ngtools/webpack/src/interfaces.ts
+++ b/packages/ngtools/webpack/src/interfaces.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -83,4 +83,12 @@ export interface AngularCompilerPluginOptions {
 
   host?: virtualFs.Host<fs.Stats>;
   platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];
+
+  /**
+   * Suppress Zone.js incompatibility warning when using ES2017+.
+   * 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
+  */
+  suppressZoneJsIncompatibilityWarning?: boolean;
 }
diff --git a/packages/ngtools/webpack/src/ivy/cache.ts b/packages/ngtools/webpack/src/ivy/cache.ts
new file mode 100644
index 000000000000..f9dee8f553d1
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/cache.ts
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { normalizePath } from './paths';
+
+export class SourceFileCache extends Map<string, ts.SourceFile> {
+  private readonly angularDiagnostics = new Map<ts.SourceFile, ts.Diagnostic[]>();
+
+  invalidate(
+    fileTimestamps: Map<string, number | { timestamp: number } | null>,
+    buildTimestamp: number,
+  ): Set<string> {
+    const changedFiles = new Set<string>();
+    for (const [file, timeOrEntry] of fileTimestamps) {
+      const time =
+        timeOrEntry && (typeof timeOrEntry === 'number' ? timeOrEntry : timeOrEntry.timestamp);
+      if (time === null || buildTimestamp < time) {
+        // Cache stores paths using the POSIX directory separator
+        const normalizedFile = normalizePath(file);
+        const sourceFile = this.get(normalizedFile);
+        if (sourceFile) {
+          this.delete(normalizedFile);
+          this.angularDiagnostics.delete(sourceFile);
+        }
+        changedFiles.add(normalizedFile);
+      }
+    }
+
+    return changedFiles;
+  }
+
+  updateAngularDiagnostics(sourceFile: ts.SourceFile, diagnostics: ts.Diagnostic[]): void {
+    if (diagnostics.length > 0) {
+      this.angularDiagnostics.set(sourceFile, diagnostics);
+    } else {
+      this.angularDiagnostics.delete(sourceFile);
+    }
+  }
+
+  getAngularDiagnostics(sourceFile: ts.SourceFile): ts.Diagnostic[] | undefined {
+    return this.angularDiagnostics.get(sourceFile);
+  }
+}
diff --git a/packages/ngtools/webpack/src/ivy/diagnostics.ts b/packages/ngtools/webpack/src/ivy/diagnostics.ts
new file mode 100644
index 000000000000..4367fc4a7c39
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/diagnostics.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Diagnostics, formatDiagnostics } from '@angular/compiler-cli';
+import { DiagnosticCategory } from 'typescript';
+import { addError, addWarning } from '../webpack-diagnostics';
+
+export type DiagnosticsReporter = (diagnostics: Diagnostics) => void;
+
+export function createDiagnosticsReporter(
+  compilation: import('webpack').compilation.Compilation,
+): DiagnosticsReporter {
+  return (diagnostics) => {
+    for (const diagnostic of diagnostics) {
+      const text = formatDiagnostics([diagnostic]);
+      if (diagnostic.category === DiagnosticCategory.Error) {
+        addError(compilation, text);
+      } else {
+        addWarning(compilation, text);
+      }
+    }
+  };
+}
diff --git a/packages/ngtools/webpack/src/ivy/host.ts b/packages/ngtools/webpack/src/ivy/host.ts
new file mode 100644
index 000000000000..8685ff88e24e
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/host.ts
@@ -0,0 +1,340 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { CompilerHost } from '@angular/compiler-cli';
+import { createHash } from 'crypto';
+import * as path from 'path';
+import * as ts from 'typescript';
+import { NgccProcessor } from '../ngcc_processor';
+import { ResourceLoader } from '../resource_loader';
+import { normalizePath } from './paths';
+
+export function augmentHostWithResources(
+  host: ts.CompilerHost,
+  resourceLoader: ResourceLoader,
+  options: { directTemplateLoading?: boolean } = {},
+) {
+  const resourceHost = host as CompilerHost;
+
+  resourceHost.readResource = function (fileName: string) {
+    const filePath = normalizePath(fileName);
+
+    if (
+      options.directTemplateLoading &&
+      (filePath.endsWith('.html') || filePath.endsWith('.svg'))
+    ) {
+      const content = this.readFile(filePath);
+      if (content === undefined) {
+        throw new Error('Unable to locate component resource: ' + fileName);
+      }
+
+      resourceLoader.setAffectedResources(filePath, [filePath]);
+
+      return content;
+    } else {
+      return resourceLoader.get(filePath);
+    }
+  };
+
+  resourceHost.resourceNameToFileName = function (resourceName: string, containingFile: string) {
+    return path.join(path.dirname(containingFile), resourceName);
+  };
+
+  resourceHost.getModifiedResourceFiles = function () {
+    return resourceLoader.getModifiedResourceFiles();
+  };
+}
+
+function augmentResolveModuleNames(
+  host: ts.CompilerHost,
+  resolvedModuleModifier: (
+    resolvedModule: ts.ResolvedModule | undefined,
+    moduleName: string,
+  ) => ts.ResolvedModule | undefined,
+  moduleResolutionCache?: ts.ModuleResolutionCache,
+): void {
+  if (host.resolveModuleNames) {
+    const baseResolveModuleNames = host.resolveModuleNames;
+    host.resolveModuleNames = function (moduleNames: string[], ...parameters) {
+      return moduleNames.map((name) => {
+        const result = baseResolveModuleNames.call(host, [name], ...parameters);
+
+        return resolvedModuleModifier(result[0], name);
+      });
+    };
+  } else {
+    host.resolveModuleNames = function (
+      moduleNames: string[],
+      containingFile: string,
+      _reusedNames: string[] | undefined,
+      redirectedReference: ts.ResolvedProjectReference | undefined,
+      options: ts.CompilerOptions,
+    ) {
+      return moduleNames.map((name) => {
+        const result = ts.resolveModuleName(
+          name,
+          containingFile,
+          options,
+          host,
+          moduleResolutionCache,
+          redirectedReference,
+        ).resolvedModule;
+
+        return resolvedModuleModifier(result, name);
+      });
+    };
+  }
+}
+
+/**
+ * Augments a TypeScript Compiler Host's resolveModuleNames function to collect dependencies
+ * of the containing file passed to the resolveModuleNames function. This process assumes
+ * that consumers of the Compiler Host will only call resolveModuleNames with modules that are
+ * actually present in a containing file.
+ * This process is a workaround for gathering a TypeScript SourceFile's dependencies as there
+ * is no currently exposed public method to do so. A BuilderProgram does have a `getAllDependencies`
+ * function. However, that function returns all transitive dependencies as well which can cause
+ * excessive Webpack rebuilds.
+ *
+ * @param host The CompilerHost to augment.
+ * @param dependencies A Map which will be used to store file dependencies.
+ * @param moduleResolutionCache An optional resolution cache to use when the host resolves a module.
+ */
+export function augmentHostWithDependencyCollection(
+  host: ts.CompilerHost,
+  dependencies: Map<string, Set<string>>,
+  moduleResolutionCache?: ts.ModuleResolutionCache,
+): void {
+  if (host.resolveModuleNames) {
+    const baseResolveModuleNames = host.resolveModuleNames;
+    host.resolveModuleNames = function (moduleNames: string[], containingFile: string, ...parameters) {
+      const results = baseResolveModuleNames.call(host, moduleNames, containingFile, ...parameters);
+
+      const containingFilePath = normalizePath(containingFile);
+      for (const result of results) {
+        if (result) {
+          const containingFileDependencies = dependencies.get(containingFilePath);
+          if (containingFileDependencies) {
+            containingFileDependencies.add(result.resolvedFileName);
+          } else {
+            dependencies.set(containingFilePath, new Set([result.resolvedFileName]));
+          }
+        }
+      }
+
+      return results;
+    };
+  } else {
+    host.resolveModuleNames = function (
+      moduleNames: string[],
+      containingFile: string,
+      _reusedNames: string[] | undefined,
+      redirectedReference: ts.ResolvedProjectReference | undefined,
+      options: ts.CompilerOptions,
+    ) {
+      return moduleNames.map((name) => {
+        const result = ts.resolveModuleName(
+          name,
+          containingFile,
+          options,
+          host,
+          moduleResolutionCache,
+          redirectedReference,
+        ).resolvedModule;
+
+        if (result) {
+          const containingFilePath = normalizePath(containingFile);
+          const containingFileDependencies = dependencies.get(containingFilePath);
+          if (containingFileDependencies) {
+            containingFileDependencies.add(result.resolvedFileName);
+          } else {
+            dependencies.set(containingFilePath, new Set([result.resolvedFileName]));
+          }
+        }
+
+        return result;
+      });
+    };
+  }
+}
+
+export function augmentHostWithNgcc(
+  host: ts.CompilerHost,
+  ngcc: NgccProcessor,
+  moduleResolutionCache?: ts.ModuleResolutionCache,
+): void {
+  augmentResolveModuleNames(
+    host,
+    (resolvedModule, moduleName) => {
+      if (resolvedModule && ngcc) {
+        ngcc.processModule(moduleName, resolvedModule);
+      }
+
+      return resolvedModule;
+    },
+    moduleResolutionCache,
+  );
+
+  if (host.resolveTypeReferenceDirectives) {
+    const baseResolveTypeReferenceDirectives = host.resolveTypeReferenceDirectives;
+    host.resolveTypeReferenceDirectives = function (names: string[], ...parameters) {
+      return names.map((name) => {
+        const result = baseResolveTypeReferenceDirectives.call(host, [name], ...parameters);
+
+        if (result[0] && ngcc) {
+          ngcc.processModule(name, result[0]);
+        }
+
+        return result[0];
+      });
+    };
+  } else {
+    host.resolveTypeReferenceDirectives = function (
+      moduleNames: string[],
+      containingFile: string,
+      redirectedReference: ts.ResolvedProjectReference | undefined,
+      options: ts.CompilerOptions,
+    ) {
+      return moduleNames.map((name) => {
+        const result = ts.resolveTypeReferenceDirective(
+          name,
+          containingFile,
+          options,
+          host,
+          redirectedReference,
+        ).resolvedTypeReferenceDirective;
+
+        if (result && ngcc) {
+          ngcc.processModule(name, result);
+        }
+
+        return result;
+      });
+    };
+  }
+}
+
+export function augmentHostWithReplacements(
+  host: ts.CompilerHost,
+  replacements: Record<string, string>,
+  moduleResolutionCache?: ts.ModuleResolutionCache,
+): void {
+  if (Object.keys(replacements).length === 0) {
+    return;
+  }
+
+  const normalizedReplacements: Record<string, string> = {};
+  for (const [key, value] of Object.entries(replacements)) {
+    normalizedReplacements[normalizePath(key)] = normalizePath(value);
+  }
+
+  const tryReplace = (resolvedModule: ts.ResolvedModule | undefined) => {
+    const replacement = resolvedModule && normalizedReplacements[resolvedModule.resolvedFileName];
+    if (replacement) {
+      return {
+        resolvedFileName: replacement,
+        isExternalLibraryImport: /[\/\\]node_modules[\/\\]/.test(replacement),
+      };
+    } else {
+      return resolvedModule;
+    }
+  };
+
+  augmentResolveModuleNames(host, tryReplace, moduleResolutionCache);
+}
+
+export function augmentHostWithSubstitutions(
+  host: ts.CompilerHost,
+  substitutions: Record<string, string>,
+): void {
+  const regexSubstitutions: [RegExp, string][] = [];
+  for (const [key, value] of Object.entries(substitutions)) {
+    regexSubstitutions.push([new RegExp(`\\b${key}\\b`, 'g'), value]);
+  }
+
+  if (regexSubstitutions.length === 0) {
+    return;
+  }
+
+  const baseReadFile = host.readFile;
+  host.readFile = function (...parameters) {
+    let file: string | undefined = baseReadFile.call(host, ...parameters);
+    if (file) {
+      for (const entry of regexSubstitutions) {
+        file = file.replace(entry[0], entry[1]);
+      }
+    }
+
+    return file;
+  };
+}
+
+export function augmentHostWithVersioning(host: ts.CompilerHost): void {
+  const baseGetSourceFile = host.getSourceFile;
+  host.getSourceFile = function (...parameters) {
+    const file: (ts.SourceFile & { version?: string }) | undefined = baseGetSourceFile.call(
+      host,
+      ...parameters,
+    );
+    if (file && file.version === undefined) {
+      file.version = createHash('sha256').update(file.text).digest('hex');
+    }
+
+    return file;
+  };
+}
+
+export function augmentProgramWithVersioning(program: ts.Program): void {
+  const baseGetSourceFiles = program.getSourceFiles;
+  program.getSourceFiles = function (...parameters) {
+    const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(
+      ...parameters,
+    );
+
+    for (const file of files) {
+      if (file.version === undefined) {
+        file.version = createHash('sha256').update(file.text).digest('hex');
+      }
+    }
+
+    return files;
+  };
+}
+
+export function augmentHostWithCaching(
+  host: ts.CompilerHost,
+  cache: Map<string, ts.SourceFile>,
+): void {
+  const baseGetSourceFile = host.getSourceFile;
+  host.getSourceFile = function (
+    fileName,
+    languageVersion,
+    onError,
+    shouldCreateNewSourceFile,
+    // tslint:disable-next-line: trailing-comma
+    ...parameters
+  ) {
+    if (!shouldCreateNewSourceFile && cache.has(fileName)) {
+      return cache.get(fileName);
+    }
+
+    const file = baseGetSourceFile.call(
+      host,
+      fileName,
+      languageVersion,
+      onError,
+      true,
+      ...parameters,
+    );
+
+    if (file) {
+      cache.set(fileName, file);
+    }
+
+    return file;
+  };
+}
diff --git a/packages/ngtools/webpack/src/ivy/index.ts b/packages/ngtools/webpack/src/ivy/index.ts
new file mode 100644
index 000000000000..54e16b32f125
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/index.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 { angularWebpackLoader as default } from './loader';
+export { AngularPluginOptions, AngularWebpackPlugin } from './plugin';
+
+export const AngularWebpackLoaderPath = __filename;
diff --git a/packages/ngtools/webpack/src/ivy/loader.ts b/packages/ngtools/webpack/src/ivy/loader.ts
new file mode 100644
index 000000000000..28eaa423db8c
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/loader.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { AngularPluginSymbol, FileEmitter } from './symbol';
+
+export function angularWebpackLoader(
+  this: import('webpack').loader.LoaderContext,
+  content: string,
+  // Source map types are broken in the webpack type definitions
+  // tslint:disable-next-line: no-any
+  map: any,
+) {
+  const callback = this.async();
+  if (!callback) {
+    throw new Error('Invalid webpack version');
+  }
+
+  const emitFile = this._compilation[AngularPluginSymbol] as FileEmitter;
+  if (typeof emitFile !== 'function') {
+    if (this.resourcePath.endsWith('.js')) {
+      // Passthrough for JS files when no plugin is used
+      this.callback(undefined, content, map);
+
+      return;
+    }
+
+    callback(new Error('The Angular Webpack loader requires the AngularWebpackPlugin.'));
+
+    return;
+  }
+
+  emitFile(this.resourcePath)
+    .then((result) => {
+      if (!result) {
+        if (this.resourcePath.endsWith('.js')) {
+          // Return original content for JS files if not compiled by TypeScript ("allowJs")
+          this.callback(undefined, content, map);
+        } else {
+          // File is not part of the compilation
+          const message =
+            `${this.resourcePath} is missing from the TypeScript compilation. ` +
+            `Please make sure it is in your tsconfig via the 'files' or 'include' property.`;
+          callback(new Error(message));
+        }
+
+        return;
+      }
+
+      result.dependencies.forEach((dependency) => this.addDependency(dependency));
+
+      let resultContent = result.content || '';
+      let resultMap;
+      if (result.map) {
+        resultContent = resultContent.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
+        resultMap = JSON.parse(result.map);
+        resultMap.sources = resultMap.sources.map((source: string) =>
+          path.join(path.dirname(this.resourcePath), source),
+        );
+      }
+
+      callback(undefined, resultContent, resultMap);
+    })
+    .catch((err) => {
+      callback(err);
+    });
+}
+
+export { angularWebpackLoader as default };
diff --git a/packages/ngtools/webpack/src/ivy/paths.ts b/packages/ngtools/webpack/src/ivy/paths.ts
new file mode 100644
index 000000000000..52a69db43657
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/paths.ts
@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 nodePath from 'path';
+
+const normalizationCache = new Map<string, string>();
+
+export function normalizePath(path: string): string {
+  let result = normalizationCache.get(path);
+
+  if (result === undefined) {
+    result = nodePath.win32.normalize(path).replace(/\\/g, nodePath.posix.sep);
+    normalizationCache.set(path, result);
+  }
+
+  return result;
+}
+
+const externalizationCache = new Map<string, string>();
+
+function externalizeForWindows(path: string): string {
+  let result = externalizationCache.get(path);
+
+  if (result === undefined) {
+    result = nodePath.win32.normalize(path);
+    externalizationCache.set(path, result);
+  }
+
+  return result;
+}
+
+export const externalizePath = (() => {
+  if (process.platform !== 'win32') {
+    return (path: string) => path;
+  }
+
+  return externalizeForWindows;
+})();
diff --git a/packages/ngtools/webpack/src/ivy/plugin.ts b/packages/ngtools/webpack/src/ivy/plugin.ts
new file mode 100644
index 000000000000..fdbd755edd4e
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/plugin.ts
@@ -0,0 +1,728 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { CompilerHost, CompilerOptions, readConfiguration } from '@angular/compiler-cli';
+import { NgtscProgram } from '@angular/compiler-cli/src/ngtsc/program';
+import { createHash } from 'crypto';
+import * as path from 'path';
+import * as ts from 'typescript';
+import {
+  Compiler,
+  ContextReplacementPlugin,
+  NormalModuleReplacementPlugin,
+  compilation,
+} from 'webpack';
+import { findLazyRoutes } from '../lazy_routes';
+import { NgccProcessor } from '../ngcc_processor';
+import { TypeScriptPathsPlugin } from '../paths-plugin';
+import { NoopResourceLoader, ResourceLoader, WebpackResourceLoader } from '../resource_loader';
+import { addError, addWarning } from '../webpack-diagnostics';
+import { isWebpackFiveOrHigher, mergeResolverMainFields } from '../webpack-version';
+import { SourceFileCache } from './cache';
+import { DiagnosticsReporter, createDiagnosticsReporter } from './diagnostics';
+import {
+  augmentHostWithCaching,
+  augmentHostWithDependencyCollection,
+  augmentHostWithNgcc,
+  augmentHostWithReplacements,
+  augmentHostWithResources,
+  augmentHostWithSubstitutions,
+  augmentProgramWithVersioning,
+} from './host';
+import { externalizePath, normalizePath } from './paths';
+import { AngularPluginSymbol, EmitFileResult, FileEmitter } from './symbol';
+import { createWebpackSystem } from './system';
+import { createAotTransformers, createJitTransformers, mergeTransformers } from './transformation';
+
+/**
+ * The threshold used to determine whether Angular file diagnostics should optimize for full programs
+ * or single files. If the number of affected files for a build is more than the threshold, full
+ * program optimization will be used.
+ */
+const DIAGNOSTICS_AFFECTED_THRESHOLD = 1;
+
+export interface AngularPluginOptions {
+  tsconfig: string;
+  compilerOptions?: CompilerOptions;
+  fileReplacements: Record<string, string>;
+  substitutions: Record<string, string>;
+  directTemplateLoading: boolean;
+  emitClassMetadata: boolean;
+  emitNgModuleScope: boolean;
+  suppressZoneJsIncompatibilityWarning: boolean;
+  jitMode: boolean;
+}
+
+// Add support for missing properties in Webpack types as well as the loader's file emitter
+interface WebpackCompilation extends compilation.Compilation {
+  compilationDependencies: Set<string>;
+  rebuildModule(module: compilation.Module, callback: () => void): void;
+  [AngularPluginSymbol]: FileEmitter;
+}
+
+function initializeNgccProcessor(
+  compiler: Compiler,
+  tsconfig: string,
+): { processor: NgccProcessor; errors: string[]; warnings: string[] } {
+  const { inputFileSystem, options: webpackOptions } = compiler;
+  const mainFields = ([] as string[]).concat(...(webpackOptions.resolve?.mainFields || []));
+
+  const errors: string[] = [];
+  const warnings: string[] = [];
+  const processor = new NgccProcessor(
+    mainFields,
+    warnings,
+    errors,
+    compiler.context,
+    tsconfig,
+    inputFileSystem,
+    webpackOptions.resolve?.symlinks,
+  );
+
+  return { processor, errors, warnings };
+}
+
+function hashContent(content: string): Uint8Array {
+  return createHash('md5').update(content).digest();
+}
+
+const PLUGIN_NAME = 'angular-compiler';
+
+export class AngularWebpackPlugin {
+  private readonly pluginOptions: AngularPluginOptions;
+  private watchMode?: boolean;
+  private ngtscNextProgram?: NgtscProgram;
+  private builder?: ts.EmitAndSemanticDiagnosticsBuilderProgram;
+  private sourceFileCache?: SourceFileCache;
+  private buildTimestamp!: number;
+  private readonly lazyRouteMap: Record<string, string> = {};
+  private readonly fileDependencies = new Map<string, Set<string>>();
+  private readonly requiredFilesToEmit = new Set<string>();
+  private readonly requiredFilesToEmitCache = new Map<string, EmitFileResult | undefined>();
+  private readonly fileEmitHistory = new Map<string, { length: number; hash: Uint8Array }>();
+
+  constructor(options: Partial<AngularPluginOptions> = {}) {
+    this.pluginOptions = {
+      emitClassMetadata: false,
+      emitNgModuleScope: false,
+      jitMode: false,
+      fileReplacements: {},
+      substitutions: {},
+      directTemplateLoading: true,
+      tsconfig: 'tsconfig.json',
+      suppressZoneJsIncompatibilityWarning: false,
+      ...options,
+    };
+  }
+
+  get options(): AngularPluginOptions {
+    return this.pluginOptions;
+  }
+
+  apply(compiler: Compiler & { watchMode?: boolean }): void {
+    // Setup file replacements with webpack
+    for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
+      new NormalModuleReplacementPlugin(
+        new RegExp('^' + key.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&') + '$'),
+        value,
+      ).apply(compiler);
+    }
+
+    // Mimic VE plugin's systemjs module loader resource location for consistency
+    new ContextReplacementPlugin(
+      /\@angular[\\\/]core[\\\/]/,
+      path.join(compiler.context, '$$_lazy_route_resource'),
+      this.lazyRouteMap,
+    ).apply(compiler);
+
+    // Set resolver options
+    const pathsPlugin = new TypeScriptPathsPlugin();
+    compiler.hooks.afterResolvers.tap('angular-compiler', (compiler) => {
+      // 'resolverFactory' is not present in the Webpack typings
+      // tslint:disable-next-line: no-any
+      const resolverFactoryHooks = (compiler as any).resolverFactory.hooks;
+
+      // 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
+      resolverFactoryHooks.resolveOptions
+        .for('normal')
+        .tap(PLUGIN_NAME, (resolveOptions: { mainFields: string[] }) => {
+          const originalMainFields = resolveOptions.mainFields;
+          const ivyMainFields = originalMainFields.map((f) => `${f}_ivy_ngcc`);
+
+          return mergeResolverMainFields(resolveOptions, originalMainFields, ivyMainFields);
+        });
+
+      resolverFactoryHooks.resolver.for('normal').tap(PLUGIN_NAME, (resolver: {}) => {
+        pathsPlugin.apply(resolver);
+      });
+    });
+
+    let ngccProcessor: NgccProcessor | undefined;
+    const resourceLoader = this.pluginOptions.jitMode
+      ? new NoopResourceLoader()
+      : new WebpackResourceLoader();
+    let previousUnused: Set<string> | undefined;
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (thisCompilation) => {
+      const compilation = thisCompilation as WebpackCompilation;
+
+      // Store watch mode; assume true if not present (webpack < 4.23.0)
+      this.watchMode = compiler.watchMode ?? true;
+
+      // Initialize and process eager ngcc if not already setup
+      if (!ngccProcessor) {
+        const { processor, errors, warnings } = initializeNgccProcessor(
+          compiler,
+          this.pluginOptions.tsconfig,
+        );
+
+        processor.process();
+        warnings.forEach((warning) => addWarning(compilation, warning));
+        errors.forEach((error) => addError(compilation, error));
+
+        ngccProcessor = processor;
+      }
+
+      // Setup and read TypeScript and Angular compiler configuration
+      const { compilerOptions, rootNames, errors } = this.loadConfiguration(compilation);
+
+      // Create diagnostics reporter and report configuration file errors
+      const diagnosticsReporter = createDiagnosticsReporter(compilation);
+      diagnosticsReporter(errors);
+
+      // Update TypeScript path mapping plugin with new configuration
+      pathsPlugin.update(compilerOptions);
+
+      // Create a Webpack-based TypeScript compiler host
+      const system = createWebpackSystem(compiler.inputFileSystem, normalizePath(compiler.context));
+      const host = ts.createIncrementalCompilerHost(compilerOptions, system);
+
+      // Setup source file caching and reuse cache from previous compilation if present
+      let cache = this.sourceFileCache;
+      let changedFiles;
+      if (cache) {
+        // Invalidate existing cache based on compiler file timestamps
+        changedFiles = cache.invalidate(compiler.fileTimestamps, this.buildTimestamp);
+
+        // Invalidate file dependencies of changed files
+        for (const changedFile of changedFiles) {
+          this.fileDependencies.delete(normalizePath(changedFile));
+        }
+      } else {
+        // Initialize a new cache
+        cache = new SourceFileCache();
+        // Only store cache if in watch mode
+        if (this.watchMode) {
+          this.sourceFileCache = cache;
+        }
+      }
+      this.buildTimestamp = Date.now();
+      augmentHostWithCaching(host, cache);
+
+      const moduleResolutionCache = ts.createModuleResolutionCache(
+        host.getCurrentDirectory(),
+        host.getCanonicalFileName.bind(host),
+        compilerOptions,
+      );
+
+      // Setup source file dependency collection
+      augmentHostWithDependencyCollection(host, this.fileDependencies, moduleResolutionCache);
+
+      // Setup on demand ngcc
+      augmentHostWithNgcc(host, ngccProcessor, moduleResolutionCache);
+
+      // Setup resource loading
+      resourceLoader.update(compilation, changedFiles);
+      augmentHostWithResources(host, resourceLoader, {
+        directTemplateLoading:
+          !this.pluginOptions.jitMode && this.pluginOptions.directTemplateLoading,
+      });
+
+      // Setup source file adjustment options
+      augmentHostWithReplacements(host, this.pluginOptions.fileReplacements, moduleResolutionCache);
+      augmentHostWithSubstitutions(host, this.pluginOptions.substitutions);
+
+      // Create the file emitter used by the webpack loader
+      const { fileEmitter, builder, internalFiles } = this.pluginOptions.jitMode
+        ? this.updateJitProgram(compilerOptions, rootNames, host, diagnosticsReporter, changedFiles)
+        : this.updateAotProgram(
+            compilerOptions,
+            rootNames,
+            host,
+            diagnosticsReporter,
+            resourceLoader,
+          );
+
+      const allProgramFiles = builder
+        .getSourceFiles()
+        .filter((sourceFile) => !internalFiles?.has(sourceFile));
+
+      // Ensure all program files are considered part of the compilation and will be watched
+      if (isWebpackFiveOrHigher()) {
+        allProgramFiles.forEach((sourceFile) =>
+          compilation.fileDependencies.add(sourceFile.fileName),
+        );
+      } else {
+        allProgramFiles.forEach((sourceFile) =>
+          compilation.compilationDependencies.add(sourceFile.fileName),
+        );
+      }
+
+      compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
+        // Rebuild any remaining AOT required modules
+        await this.rebuildRequiredFiles(modules, compilation, fileEmitter);
+
+        // Analyze program for unused files
+        if (compilation.errors.length > 0) {
+          return;
+        }
+
+        const currentUnused = new Set(
+          allProgramFiles
+            .filter((sourceFile) => !sourceFile.isDeclarationFile)
+            .map((sourceFile) => normalizePath(sourceFile.fileName)),
+        );
+        modules.forEach(({ resource }: compilation.Module & { resource?: string }) => {
+          if (resource) {
+            this.markResourceUsed(normalizePath(resource), currentUnused);
+          }
+        });
+        for (const unused of currentUnused) {
+          if (previousUnused && previousUnused.has(unused)) {
+            continue;
+          }
+          addWarning(
+            compilation,
+            `${unused} is part of the TypeScript compilation but it's unused.\n` +
+              `Add only entry points to the 'files' or 'include' properties in your tsconfig.`,
+          );
+        }
+        previousUnused = currentUnused;
+      });
+
+      // Store file emitter for loader usage
+      compilation[AngularPluginSymbol] = fileEmitter;
+    });
+  }
+
+  private markResourceUsed(normalizedResourcePath: string, currentUnused: Set<string>): void {
+    if (!currentUnused.has(normalizedResourcePath)) {
+      return;
+    }
+
+    currentUnused.delete(normalizedResourcePath);
+    const dependencies = this.fileDependencies.get(normalizedResourcePath);
+    if (!dependencies) {
+      return;
+    }
+    for (const dependency of dependencies) {
+      this.markResourceUsed(normalizePath(dependency), currentUnused);
+    }
+  }
+
+  private async rebuildRequiredFiles(
+    modules: Iterable<compilation.Module>,
+    compilation: WebpackCompilation,
+    fileEmitter: FileEmitter,
+  ): Promise<void> {
+    if (this.requiredFilesToEmit.size === 0) {
+      return;
+    }
+
+    const rebuild = (webpackModule: compilation.Module) =>
+      new Promise<void>((resolve) => compilation.rebuildModule(webpackModule, resolve));
+
+    const filesToRebuild = new Set<string>();
+    for (const requiredFile of this.requiredFilesToEmit) {
+      const history = this.fileEmitHistory.get(requiredFile);
+      if (history) {
+        const emitResult = await fileEmitter(requiredFile);
+        if (
+          emitResult?.content === undefined ||
+          history.length !== emitResult.content.length ||
+          emitResult.hash === undefined ||
+          Buffer.compare(history.hash, emitResult.hash) !== 0
+        ) {
+          // New emit result is different so rebuild using new emit result
+          this.requiredFilesToEmitCache.set(requiredFile, emitResult);
+          filesToRebuild.add(requiredFile);
+        }
+      } else {
+        // No emit history so rebuild
+        filesToRebuild.add(requiredFile);
+      }
+    }
+
+    if (filesToRebuild.size > 0) {
+      for (const webpackModule of [...modules]) {
+        const resource = (webpackModule as compilation.Module & { resource?: string }).resource;
+        if (resource && filesToRebuild.has(normalizePath(resource))) {
+          await rebuild(webpackModule);
+        }
+      }
+    }
+
+    this.requiredFilesToEmit.clear();
+    this.requiredFilesToEmitCache.clear();
+  }
+
+  private loadConfiguration(compilation: WebpackCompilation) {
+    const { options: compilerOptions, rootNames, errors } = readConfiguration(
+      this.pluginOptions.tsconfig,
+      this.pluginOptions.compilerOptions,
+    );
+    compilerOptions.enableIvy = true;
+    compilerOptions.noEmitOnError = false;
+    compilerOptions.suppressOutputPathCheck = true;
+    compilerOptions.outDir = undefined;
+    compilerOptions.inlineSources = compilerOptions.sourceMap;
+    compilerOptions.inlineSourceMap = false;
+    compilerOptions.mapRoot = undefined;
+    compilerOptions.sourceRoot = undefined;
+    compilerOptions.allowEmptyCodegenFiles = false;
+    compilerOptions.annotationsAs = 'decorators';
+    compilerOptions.enableResourceInlining = false;
+
+    if (
+      !this.pluginOptions.suppressZoneJsIncompatibilityWarning &&
+      compilerOptions.target &&
+      compilerOptions.target >= ts.ScriptTarget.ES2017
+    ) {
+      addWarning(
+        compilation,
+        'Zone.js does not support native async/await in ES2017+.\n' +
+          'These blocks are not intercepted by zone.js and will not triggering change detection.\n' +
+          'See: https://github.com/angular/zone.js/pull/1140 for more information.',
+      );
+    }
+
+    return { compilerOptions, rootNames, errors };
+  }
+
+  private updateAotProgram(
+    compilerOptions: CompilerOptions,
+    rootNames: string[],
+    host: CompilerHost,
+    diagnosticsReporter: DiagnosticsReporter,
+    resourceLoader: ResourceLoader,
+  ) {
+    // Create the Angular specific program that contains the Angular compiler
+    const angularProgram = new NgtscProgram(
+      rootNames,
+      compilerOptions,
+      host,
+      this.ngtscNextProgram,
+    );
+    const angularCompiler = angularProgram.compiler;
+
+    // The `ignoreForEmit` return value can be safely ignored when emitting. Only files
+    // that will be bundled (requested by Webpack) will be emitted. Combined with TypeScript's
+    // eliding of type only imports, this will cause type only files to be automatically ignored.
+    // Internal Angular type check files are also not resolvable by the bundler. Even if they
+    // were somehow errantly imported, the bundler would error before an emit was attempted.
+    // Diagnostics are still collected for all files which requires using `ignoreForDiagnostics`.
+    const { ignoreForDiagnostics, ignoreForEmit } = angularCompiler;
+
+    // SourceFile versions are required for builder programs.
+    // The wrapped host inside NgtscProgram adds additional files that will not have versions.
+    const typeScriptProgram = angularProgram.getTsProgram();
+    augmentProgramWithVersioning(typeScriptProgram);
+
+    const builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
+      typeScriptProgram,
+      host,
+      this.builder,
+    );
+
+    // Save for next rebuild
+    if (this.watchMode) {
+      this.builder = builder;
+      this.ngtscNextProgram = angularProgram;
+    }
+
+    // Update semantic diagnostics cache
+    const affectedFiles = new Set<ts.SourceFile>();
+    while (true) {
+      const result = builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
+        // If the affected file is a TTC shim, add the shim's original source file.
+        // This ensures that changes that affect TTC are typechecked even when the changes
+        // are otherwise unrelated from a TS perspective and do not result in Ivy codegen changes.
+        // For example, changing @Input property types of a directive used in another component's
+        // template.
+        if (
+          ignoreForDiagnostics.has(sourceFile) &&
+          sourceFile.fileName.endsWith('.ngtypecheck.ts')
+        ) {
+          // This file name conversion relies on internal compiler logic and should be converted
+          // to an official method when available. 15 is length of `.ngtypecheck.ts`
+          const originalFilename = sourceFile.fileName.slice(0, -15) + '.ts';
+          const originalSourceFile = builder.getSourceFile(originalFilename);
+          if (originalSourceFile) {
+            affectedFiles.add(originalSourceFile);
+          }
+
+          return true;
+        }
+
+        return false;
+      });
+
+      if (!result) {
+        break;
+      }
+
+      affectedFiles.add(result.affected as ts.SourceFile);
+    }
+
+    // Collect non-semantic diagnostics
+    const diagnostics = [
+      ...angularCompiler.getOptionDiagnostics(),
+      ...builder.getOptionsDiagnostics(),
+      ...builder.getGlobalDiagnostics(),
+      ...builder.getSyntacticDiagnostics(),
+    ];
+    diagnosticsReporter(diagnostics);
+
+    // Collect semantic diagnostics
+    for (const sourceFile of builder.getSourceFiles()) {
+      if (!ignoreForDiagnostics.has(sourceFile)) {
+        diagnosticsReporter(builder.getSemanticDiagnostics(sourceFile));
+      }
+    }
+
+    const transformers = createAotTransformers(builder, this.pluginOptions);
+
+    const getDependencies = (sourceFile: ts.SourceFile) => {
+      const dependencies = [];
+      for (const resourcePath of angularCompiler.getResourceDependencies(sourceFile)) {
+        dependencies.push(
+          resourcePath,
+          // Retrieve all dependencies of the resource (stylesheet imports, etc.)
+          ...resourceLoader.getResourceDependencies(resourcePath),
+        );
+      }
+
+      return dependencies;
+    };
+
+    // Required to support asynchronous resource loading
+    // Must be done before creating transformers or getting template diagnostics
+    const pendingAnalysis = angularCompiler.analyzeAsync().then(() => {
+      this.requiredFilesToEmit.clear();
+
+      for (const sourceFile of builder.getSourceFiles()) {
+        if (sourceFile.isDeclarationFile) {
+          continue;
+        }
+
+        // Collect sources that are required to be emitted
+        if (
+          !ignoreForEmit.has(sourceFile) &&
+          !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)
+        ) {
+          this.requiredFilesToEmit.add(normalizePath(sourceFile.fileName));
+
+          // If required to emit, diagnostics may have also changed
+          if (!ignoreForDiagnostics.has(sourceFile)) {
+            affectedFiles.add(sourceFile);
+          }
+        } else if (
+          this.sourceFileCache &&
+          !affectedFiles.has(sourceFile) &&
+          !ignoreForDiagnostics.has(sourceFile)
+        ) {
+          // Use cached Angular diagnostics for unchanged and unaffected files
+          const angularDiagnostics = this.sourceFileCache.getAngularDiagnostics(sourceFile);
+          if (angularDiagnostics) {
+            diagnosticsReporter(angularDiagnostics);
+          }
+        }
+      }
+
+      // NOTE: This can be removed once support for the deprecated lazy route string format is removed
+      for (const lazyRoute of angularCompiler.listLazyRoutes()) {
+        const [routeKey] = lazyRoute.route.split('#');
+        this.lazyRouteMap[routeKey] = lazyRoute.referencedModule.filePath;
+      }
+
+      // Collect new Angular diagnostics for files affected by changes
+      const { OptimizeFor } = require('@angular/compiler-cli/src/ngtsc/typecheck/api');
+      const optimizeDiagnosticsFor =
+        affectedFiles.size <= DIAGNOSTICS_AFFECTED_THRESHOLD
+          ? OptimizeFor.SingleFile
+          : OptimizeFor.WholeProgram;
+      for (const affectedFile of affectedFiles) {
+        const angularDiagnostics = angularCompiler.getDiagnosticsForFile(
+          affectedFile,
+          optimizeDiagnosticsFor,
+        );
+        diagnosticsReporter(angularDiagnostics);
+        this.sourceFileCache?.updateAngularDiagnostics(affectedFile, angularDiagnostics);
+      }
+
+      // NOTE: Workaround to fix stale reuse program. Can be removed once fixed upstream.
+      // tslint:disable-next-line: no-any
+      (angularProgram as any).reuseTsProgram = angularCompiler.getNextProgram();
+
+      return this.createFileEmitter(
+        builder,
+        mergeTransformers(angularCompiler.prepareEmit().transformers, transformers),
+        getDependencies,
+        (sourceFile) => {
+          this.requiredFilesToEmit.delete(normalizePath(sourceFile.fileName));
+          angularCompiler.incrementalDriver.recordSuccessfulEmit(sourceFile);
+        },
+      );
+    });
+    const analyzingFileEmitter: FileEmitter = async (file) => {
+      const innerFileEmitter = await pendingAnalysis;
+
+      return innerFileEmitter(file);
+    };
+
+    return {
+      fileEmitter: analyzingFileEmitter,
+      builder,
+      internalFiles: ignoreForEmit,
+    };
+  }
+
+  private updateJitProgram(
+    compilerOptions: CompilerOptions,
+    rootNames: readonly string[],
+    host: CompilerHost,
+    diagnosticsReporter: DiagnosticsReporter,
+    changedFiles: Set<string> | undefined,
+  ) {
+    const builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
+      rootNames,
+      compilerOptions,
+      host,
+      this.builder,
+    );
+
+    // Save for next rebuild
+    if (this.watchMode) {
+      this.builder = builder;
+    }
+
+    const diagnostics = [
+      ...builder.getOptionsDiagnostics(),
+      ...builder.getGlobalDiagnostics(),
+      ...builder.getSyntacticDiagnostics(),
+      // Gather incremental semantic diagnostics
+      ...builder.getSemanticDiagnostics(),
+    ];
+    diagnosticsReporter(diagnostics);
+
+    const transformers = createJitTransformers(builder, this.pluginOptions);
+
+    // Only do a full, expensive Angular compiler string lazy route analysis on the first build
+    // `changedFiles` will be undefined on a first build
+    if (!changedFiles) {
+      // Required to support asynchronous resource loading
+      // Must be done before listing lazy routes
+      // NOTE: This can be removed once support for the deprecated lazy route string format is removed
+      const angularProgram = new NgtscProgram(
+        rootNames,
+        compilerOptions,
+        host,
+      );
+      const angularCompiler = angularProgram.compiler;
+      const pendingAnalysis = angularCompiler.analyzeAsync().then(() => {
+        for (const lazyRoute of angularCompiler.listLazyRoutes()) {
+          const [routeKey] = lazyRoute.route.split('#');
+          this.lazyRouteMap[routeKey] = lazyRoute.referencedModule.filePath;
+        }
+
+        return this.createFileEmitter(builder, transformers, () => []);
+      });
+      const analyzingFileEmitter: FileEmitter = async (file) => {
+        const innerFileEmitter = await pendingAnalysis;
+
+        return innerFileEmitter(file);
+      };
+
+      return {
+        fileEmitter: analyzingFileEmitter,
+        builder,
+        internalFiles: undefined,
+      };
+    } else {
+      // Update lazy route map for changed files using fast but less accurate method
+      for (const changedFile of changedFiles) {
+        if (!builder.getSourceFile(changedFile)) {
+          continue;
+        }
+
+        const routes = findLazyRoutes(changedFile, host, builder.getProgram());
+        for (const [routeKey, filePath] of Object.entries(routes)) {
+          this.lazyRouteMap[routeKey] = filePath;
+        }
+      }
+
+      return {
+        fileEmitter: this.createFileEmitter(builder, transformers, () => []),
+        builder,
+        internalFiles: undefined,
+      };
+    }
+  }
+
+  private createFileEmitter(
+    program: ts.BuilderProgram,
+    transformers: ts.CustomTransformers = {},
+    getExtraDependencies: (sourceFile: ts.SourceFile) => Iterable<string>,
+    onAfterEmit?: (sourceFile: ts.SourceFile) => void,
+  ): FileEmitter {
+    return async (file: string) => {
+      const filePath = normalizePath(file);
+      if (this.requiredFilesToEmitCache.has(filePath)) {
+        return this.requiredFilesToEmitCache.get(filePath);
+      }
+
+      const sourceFile = program.getSourceFile(filePath);
+      if (!sourceFile) {
+        return undefined;
+      }
+
+      let content: string | undefined;
+      let map: string | undefined;
+      program.emit(
+        sourceFile,
+        (filename, data) => {
+          if (filename.endsWith('.map')) {
+            map = data;
+          } else if (filename.endsWith('.js')) {
+            content = data;
+          }
+        },
+        undefined,
+        undefined,
+        transformers,
+      );
+
+      onAfterEmit?.(sourceFile);
+
+      let hash;
+      if (content !== undefined && this.watchMode) {
+        // Capture emit history info for Angular rebuild analysis
+        hash = hashContent(content);
+        this.fileEmitHistory.set(filePath, { length: content.length, hash });
+      }
+
+      const dependencies = [
+        ...(this.fileDependencies.get(filePath) || []),
+        ...getExtraDependencies(sourceFile),
+      ].map(externalizePath);
+
+      return { content, map, dependencies, hash };
+    };
+  }
+}
diff --git a/packages/ngtools/webpack/src/ivy/symbol.ts b/packages/ngtools/webpack/src/ivy/symbol.ts
new file mode 100644
index 000000000000..69192af85031
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/symbol.ts
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use 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 AngularPluginSymbol = Symbol.for('@angular-devkit/build-angular[angular-compiler]');
+
+export interface EmitFileResult {
+  content?: string;
+  map?: string;
+  dependencies: readonly string[];
+  hash?: Uint8Array;
+}
+
+export type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
diff --git a/packages/ngtools/webpack/src/ivy/system.ts b/packages/ngtools/webpack/src/ivy/system.ts
new file mode 100644
index 000000000000..ede6f3af5337
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/system.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 { externalizePath } from './paths';
+
+function shouldNotWrite(): never {
+  throw new Error('Webpack TypeScript System should not write.');
+}
+
+export function createWebpackSystem(input: InputFileSystem, currentDirectory: string): ts.System {
+  // Webpack's CachedInputFileSystem uses the default directory separator in the paths it uses
+  // for keys to its cache. If the keys do not match then the file watcher will not purge outdated
+  // files and cause stale data to be used in the next rebuild. TypeScript always uses a `/` (POSIX)
+  // directory separator internally which is also supported with Windows system APIs. However,
+  // if file operations are performed with the non-default directory separator, the Webpack cache
+  // will contain a key that will not be purged. `externalizePath` ensures the paths are as expected.
+  const system: ts.System = {
+    ...ts.sys,
+    readFile(path: string) {
+      let data;
+      try {
+        data = input.readFileSync(externalizePath(path));
+      } catch {
+        return undefined;
+      }
+
+      // Strip BOM if present
+      let start = 0;
+      if (data.length > 3 && data[0] === 0xef && data[1] === 0xbb && data[2] === 0xbf) {
+        start = 3;
+      }
+
+      return data.toString('utf8', start);
+    },
+    getFileSize(path: string) {
+      try {
+        return input.statSync(externalizePath(path)).size;
+      } catch {
+        return 0;
+      }
+    },
+    fileExists(path: string) {
+      try {
+        return input.statSync(externalizePath(path)).isFile();
+      } catch {
+        return false;
+      }
+    },
+    directoryExists(path: string) {
+      try {
+        return input.statSync(externalizePath(path)).isDirectory();
+      } catch {
+        return false;
+      }
+    },
+    getModifiedTime(path: string) {
+      try {
+        return input.statSync(externalizePath(path)).mtime;
+      } catch {
+        return undefined;
+      }
+    },
+    getCurrentDirectory() {
+      return currentDirectory;
+    },
+    writeFile: shouldNotWrite,
+    createDirectory: shouldNotWrite,
+    deleteFile: shouldNotWrite,
+    setModifiedTime: shouldNotWrite,
+  };
+
+  return system;
+}
diff --git a/packages/ngtools/webpack/src/ivy/transformation.ts b/packages/ngtools/webpack/src/ivy/transformation.ts
new file mode 100644
index 000000000000..c59289cc6d9e
--- /dev/null
+++ b/packages/ngtools/webpack/src/ivy/transformation.ts
@@ -0,0 +1,142 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { constructorParametersDownlevelTransform } from '@angular/compiler-cli';
+import * as ts from 'typescript';
+import { elideImports } from '../transformers/elide_imports';
+import { removeIvyJitSupportCalls } from '../transformers/remove-ivy-jit-support-calls';
+import { replaceResources } from '../transformers/replace_resources';
+
+export function createAotTransformers(
+  builder: ts.BuilderProgram,
+  options: { emitClassMetadata?: boolean; emitNgModuleScope?: boolean },
+): ts.CustomTransformers {
+  const getTypeChecker = () => builder.getProgram().getTypeChecker();
+  const transformers: ts.CustomTransformers = {
+    before: [replaceBootstrap(getTypeChecker)],
+    after: [],
+  };
+
+  const removeClassMetadata = !options.emitClassMetadata;
+  const removeNgModuleScope = !options.emitNgModuleScope;
+  if (removeClassMetadata || removeNgModuleScope) {
+    // tslint:disable-next-line: no-non-null-assertion
+    transformers.before!.push(
+      removeIvyJitSupportCalls(removeClassMetadata, removeNgModuleScope, getTypeChecker),
+    );
+  }
+
+  return transformers;
+}
+
+export function createJitTransformers(
+  builder: ts.BuilderProgram,
+  options: { directTemplateLoading?: boolean },
+): ts.CustomTransformers {
+  const getTypeChecker = () => builder.getProgram().getTypeChecker();
+
+  return {
+    before: [
+      replaceResources(() => true, getTypeChecker, options.directTemplateLoading),
+      constructorParametersDownlevelTransform(builder.getProgram()),
+    ],
+  };
+}
+
+export function mergeTransformers(
+  first: ts.CustomTransformers,
+  second: ts.CustomTransformers,
+): ts.CustomTransformers {
+  const result: ts.CustomTransformers = {};
+
+  if (first.before || second.before) {
+    result.before = [...(first.before || []), ...(second.before || [])];
+  }
+
+  if (first.after || second.after) {
+    result.after = [...(first.after || []), ...(second.after || [])];
+  }
+
+  if (first.afterDeclarations || second.afterDeclarations) {
+    result.afterDeclarations = [
+      ...(first.afterDeclarations || []),
+      ...(second.afterDeclarations || []),
+    ];
+  }
+
+  return result;
+}
+
+export function replaceBootstrap(
+  getTypeChecker: () => ts.TypeChecker,
+): ts.TransformerFactory<ts.SourceFile> {
+  return (context: ts.TransformationContext) => {
+    let bootstrapImport: ts.ImportDeclaration | undefined;
+    let bootstrapNamespace: ts.Identifier | undefined;
+    const replacedNodes: ts.Node[] = [];
+    const nodeFactory = context.factory;
+
+    const visitNode: ts.Visitor = (node: ts.Node) => {
+      if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
+        const target = node.expression;
+        if (target.text === 'platformBrowserDynamic') {
+          if (!bootstrapNamespace) {
+            bootstrapNamespace = nodeFactory.createUniqueName('__NgCli_bootstrap_');
+            bootstrapImport = nodeFactory.createImportDeclaration(
+              undefined,
+              undefined,
+              nodeFactory.createImportClause(false, undefined, nodeFactory.createNamespaceImport(bootstrapNamespace)),
+              nodeFactory.createStringLiteral('@angular/platform-browser'),
+            );
+          }
+          replacedNodes.push(target);
+
+          return nodeFactory.updateCallExpression(
+            node,
+            nodeFactory.createPropertyAccessExpression(bootstrapNamespace, 'platformBrowser'),
+            node.typeArguments,
+            node.arguments,
+          );
+        }
+      }
+
+      return ts.visitEachChild(node, visitNode, context);
+    };
+
+    return (sourceFile: ts.SourceFile) => {
+      let updatedSourceFile = ts.visitEachChild(sourceFile, visitNode, context);
+
+      if (bootstrapImport) {
+        // Remove any unused platform browser dynamic imports
+        const removals = elideImports(
+          updatedSourceFile,
+          replacedNodes,
+          getTypeChecker,
+          context.getCompilerOptions(),
+        ).map((op) => op.target);
+        if (removals.length > 0) {
+          updatedSourceFile = ts.visitEachChild(
+            updatedSourceFile,
+            (node) => (removals.includes(node) ? undefined : node),
+            context,
+          );
+        }
+
+        // Add new platform browser import
+        return nodeFactory.updateSourceFile(
+          updatedSourceFile,
+          ts.setTextRange(
+            nodeFactory.createNodeArray([bootstrapImport, ...updatedSourceFile.statements]),
+            sourceFile.statements,
+          ),
+        );
+      } else {
+        return updatedSourceFile;
+      }
+    };
+  };
+}
diff --git a/packages/ngtools/webpack/src/lazy_routes.ts b/packages/ngtools/webpack/src/lazy_routes.ts
index a836936cf1c8..0cdf2cb6ff2a 100644
--- a/packages/ngtools/webpack/src/lazy_routes.ts
+++ b/packages/ngtools/webpack/src/lazy_routes.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/loader.ts b/packages/ngtools/webpack/src/loader.ts
index f3a94b41449a..c738b14eb811 100644
--- a/packages/ngtools/webpack/src/loader.ts
+++ b/packages/ngtools/webpack/src/loader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index ec95cda85129..b410d20a33b3 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -9,9 +9,11 @@
 import { LogLevel, Logger, process as mainNgcc } from '@angular/compiler-cli/ngcc';
 import { spawnSync } from 'child_process';
 import { createHash } from 'crypto';
+import { Resolver, ResolverFactory } from 'enhanced-resolve';
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
+import { InputFileSystem } from 'webpack';
 import { time, timeEnd } from './benchmark';
 
 // We cannot create a plugin for this, because NGTSC requires addition type
@@ -28,17 +30,28 @@ export class NgccProcessor {
   private _processedModules = new Set<string>();
   private _logger: NgccLogger;
   private _nodeModulesDirectory: string;
+  private _resolver: Resolver;
 
   constructor(
     private readonly propertiesToConsider: string[],
-    private readonly fileWatchPurger: (path: string) => void,
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
     private readonly basePath: string,
     private readonly tsConfigPath: string,
+    private readonly inputFileSystem: InputFileSystem,
+    private readonly symlinks: boolean | undefined,
   ) {
     this._logger = new NgccLogger(this.compilationWarnings, this.compilationErrors);
     this._nodeModulesDirectory = this.findNodeModulesDirectory(this.basePath);
+
+    this._resolver = ResolverFactory.createResolver({
+      // NOTE: @types/webpack InputFileSystem is missing some methods
+      // tslint:disable-next-line: no-any
+      fileSystem: this.inputFileSystem as any,
+      extensions: ['.json'],
+      useSyncFileSystemCalls: true,
+      symlinks,
+    });
   }
 
   /** Process the entire node modules tree. */
@@ -191,7 +204,10 @@ export class NgccProcessor {
 
     // Purge this file from cache, since NGCC add new mainFields. Ex: module_ivy_ngcc
     // which are unknown in the cached file.
-    this.fileWatchPurger(packageJsonPath);
+    if (this.inputFileSystem.purge) {
+      // tslint:disable-next-line: no-any
+      (this.inputFileSystem.purge as any)(packageJsonPath);
+    }
 
     this._processedModules.add(resolvedFileName);
   }
@@ -205,14 +221,10 @@ export class NgccProcessor {
    */
   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
-      return require.resolve(`${moduleName}/package.json`, {
-        paths: [resolvedFileName],
-      });
+      const resolvedPath = this._resolver.resolveSync({}, resolvedFileName, `${moduleName}/package.json`);
+
+      return resolvedPath || undefined;
     } 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
       // or local libraries which don't reside in node_modules
       const packageJsonPath = path.resolve(resolvedFileName, '../package.json');
diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
index 46bf71ebe1cb..579a65ce488b 100644
--- a/packages/ngtools/webpack/src/paths-plugin.ts
+++ b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -16,14 +16,14 @@ export interface TypeScriptPathsPluginOptions extends Pick<CompilerOptions, 'pat
 }
 
 export class TypeScriptPathsPlugin {
-  constructor(private _options: TypeScriptPathsPluginOptions) { }
+  constructor(private options?: TypeScriptPathsPluginOptions) {}
+
+  update(options: TypeScriptPathsPluginOptions): void {
+    this.options = options;
+  }
 
   // tslint:disable-next-line:no-any
   apply(resolver: any) {
-    if (!this._options.paths || Object.keys(this._options.paths).length === 0) {
-      return;
-    }
-
     const target = resolver.ensureHook('resolve');
     const resolveAsync = (request: NormalModuleFactoryRequest, requestContext: {}) => {
       return new Promise<NormalModuleFactoryRequest | undefined>((resolve, reject) => {
@@ -46,6 +46,10 @@ export class TypeScriptPathsPlugin {
     resolver.getHook('described-resolve').tapPromise(
       'TypeScriptPathsPlugin',
       async (request: NormalModuleFactoryRequest, resolveContext: {}) => {
+        if (!this.options) {
+          throw new Error('TypeScriptPathsPlugin options were not provided.');
+        }
+
         if (!request || request.typescriptPathMapped) {
           return;
         }
@@ -70,11 +74,11 @@ export class TypeScriptPathsPlugin {
           return;
         }
 
-        const replacements = findReplacements(originalRequest, this._options.paths || {});
+        const replacements = findReplacements(originalRequest, this.options.paths || {});
         for (const potential of replacements) {
           const potentialRequest = {
             ...request,
-            request: path.resolve(this._options.baseUrl || '', potential),
+            request: path.resolve(this.options.baseUrl || '', potential),
             typescriptPathMapped: true,
           };
           const result = await resolveAsync(potentialRequest, resolveContext);
diff --git a/packages/ngtools/webpack/src/refactor.ts b/packages/ngtools/webpack/src/refactor.ts
index 3aa5a6f001a0..8eea144340d3 100644
--- a/packages/ngtools/webpack/src/refactor.ts
+++ b/packages/ngtools/webpack/src/refactor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index cb3cbc234cdb..5f228e1b7094 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -11,7 +11,18 @@
 import * as path from 'path';
 import * as vm from 'vm';
 import { RawSource } from 'webpack-sources';
-import { forwardSlashPath } from './utils';
+import { normalizePath } from './ivy/paths';
+
+export interface ResourceLoader {
+  get(file: string): Promise<string>;
+  getModifiedResourceFiles(): Set<string>;
+  getResourceDependencies(file: string): Iterable<string>;
+  setAffectedResources(file: string, resources: Iterable<string>): void;
+  update(
+    parentCompilation: import('webpack').compilation.Compilation,
+    changedFiles?: Iterable<string>,
+  ): void;
+}
 
 const NodeTemplatePlugin = require('webpack/lib/node/NodeTemplatePlugin');
 const NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin');
@@ -22,21 +33,56 @@ const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
 interface CompilationOutput {
   outputName: string;
   source: string;
+  success: boolean;
+}
+
+export class NoopResourceLoader implements ResourceLoader {
+  async get(): Promise<string> {
+    return '';
+  }
+
+  getModifiedResourceFiles(): Set<string> {
+    return new Set();
+  }
+
+  getResourceDependencies(): Iterable<string> {
+    return [];
+  }
+
+  setAffectedResources(): void {}
+  update(): void {}
 }
 
 export class WebpackResourceLoader {
   private _parentCompilation: any;
-  private _context = '';
   private _fileDependencies = new Map<string, Set<string>>();
   private _reverseDependencies = new Map<string, Set<string>>();
-  private _cachedSources = new Map<string, string>();
-  private _cachedEvaluatedSources = new Map<string, RawSource>();
 
-  constructor() {}
+  private cache = new Map<string, string>();
+  private modifiedResources = new Set<string>();
 
-  update(parentCompilation: any) {
+  update(
+    parentCompilation: import('webpack').compilation.Compilation,
+    changedFiles?: Iterable<string>,
+  ) {
     this._parentCompilation = parentCompilation;
-    this._context = parentCompilation.context;
+
+    // Update resource cache and modified resources
+    this.modifiedResources.clear();
+    if (changedFiles) {
+      for (const changedFile of changedFiles) {
+        for (const affectedResource of this.getAffectedResources(changedFile)) {
+          this.cache.delete(normalizePath(affectedResource));
+          this.modifiedResources.add(affectedResource);
+        }
+      }
+    } else {
+      this.cache.clear();
+    }
+  }
+
+  getModifiedResourceFiles() {
+    return this.modifiedResources;
   }
 
   getResourceDependencies(filePath: string) {
@@ -47,8 +93,11 @@ export class WebpackResourceLoader {
     return this._reverseDependencies.get(file) || [];
   }
 
-  private async _compile(filePath: string): Promise<CompilationOutput> {
+  setAffectedResources(file: string, resources: Iterable<string>) {
+    this._reverseDependencies.set(file, new Set(resources));
+  }
 
+  private async _compile(filePath: string): Promise<CompilationOutput> {
     if (!this._parentCompilation) {
       throw new Error('WebpackResourceLoader cannot be used without parentCompilation');
     }
@@ -61,38 +110,32 @@ export class WebpackResourceLoader {
     }
 
     const outputOptions = { filename: filePath };
-    const relativePath = path.relative(this._context || '', filePath);
+    const context = this._parentCompilation.context;
+    const relativePath = path.relative(context || '', filePath);
     const childCompiler = this._parentCompilation.createChildCompiler(relativePath, outputOptions);
-    childCompiler.context = this._context;
+    childCompiler.context = context;
 
     new NodeTemplatePlugin(outputOptions).apply(childCompiler);
     new NodeTargetPlugin().apply(childCompiler);
-    new SingleEntryPlugin(this._context, filePath).apply(childCompiler);
+    new SingleEntryPlugin(context, filePath).apply(childCompiler);
     new LibraryTemplatePlugin('resource', 'var').apply(childCompiler);
 
     childCompiler.hooks.thisCompilation.tap('ngtools-webpack', (compilation: any) => {
-      compilation.hooks.additionalAssets.tapAsync('ngtools-webpack',
-      (callback: (err?: Error) => void) => {
-        if (this._cachedEvaluatedSources.has(compilation.fullHash)) {
-          const cachedEvaluatedSource = this._cachedEvaluatedSources.get(compilation.fullHash);
-          compilation.assets[filePath] = cachedEvaluatedSource;
-          callback();
-
+      compilation.hooks.additionalAssets.tap('ngtools-webpack', () => {
+        const asset = compilation.assets[filePath];
+        if (!asset) {
           return;
         }
 
-        const asset = compilation.assets[filePath];
-        if (asset) {
-          this._evaluate({ outputName: filePath, source: asset.source() })
-            .then(output => {
-              const evaluatedSource = new RawSource(output);
-              this._cachedEvaluatedSources.set(compilation.fullHash, evaluatedSource);
-              compilation.assets[filePath] = evaluatedSource;
-              callback();
-            })
-            .catch(err => callback(err));
-        } else {
-          callback();
+        try {
+          const output = this._evaluate(filePath, asset.source());
+
+          if (typeof output === 'string') {
+            compilation.assets[filePath] = new RawSource(output);
+          }
+        } catch (error) {
+          // Use compilation errors, as otherwise webpack will choke
+          compilation.errors.push(error);
         }
       });
     });
@@ -117,13 +160,13 @@ export class WebpackResourceLoader {
       this._parentCompilation.errors.push(...errors);
     }
 
-    Object.keys(childCompilation.assets).forEach(assetName => {
+    Object.keys(childCompilation.assets).forEach((assetName) => {
       // Add all new assets to the parent compilation, with the exception of
       // the file we're loading and its sourcemap.
       if (
-        assetName !== filePath
-        && assetName !== `${filePath}.map`
-        && this._parentCompilation.assets[assetName] == undefined
+        assetName !== filePath &&
+        assetName !== `${filePath}.map` &&
+        this._parentCompilation.assets[assetName] == undefined
       ) {
         this._parentCompilation.assets[assetName] = childCompilation.assets[assetName];
       }
@@ -132,7 +175,7 @@ export class WebpackResourceLoader {
     // Save the dependencies for this resource.
     this._fileDependencies.set(filePath, new Set(childCompilation.fileDependencies));
     for (const file of childCompilation.fileDependencies) {
-      const resolvedFile = forwardSlashPath(file);
+      const resolvedFile = normalizePath(file);
       const entry = this._reverseDependencies.get(resolvedFile);
       if (entry) {
         entry.add(filePath);
@@ -141,34 +184,46 @@ export class WebpackResourceLoader {
       }
     }
 
-    const compilationHash = childCompilation.fullHash;
-    const maybeSource = this._cachedSources.get(compilationHash);
-    if (maybeSource) {
-      return { outputName: filePath, source: maybeSource };
-    } else {
-      const source = childCompilation.assets[filePath].source();
-      this._cachedSources.set(compilationHash, source);
+    const finalOutput = childCompilation.assets[filePath]?.source();
 
-      return { outputName: filePath, source };
-    }
+    return { outputName: filePath, source: finalOutput ?? '', success: !errors?.length };
   }
 
-  private async _evaluate({ outputName, source }: CompilationOutput): Promise<string> {
-      // Evaluate code
-      const context: { resource?: string | { default?: string } } = {};
-      vm.runInNewContext(source, context, { filename: outputName });
+  private _evaluate(filename: string, source: string): string | null {
+    // Evaluate code
+    const context: { resource?: string | { default?: string } } = {};
 
-      if (typeof context.resource === 'string') {
-        return context.resource;
-      } else if (typeof context.resource?.default === 'string') {
-        return context.resource.default;
-      }
+    try {
+      vm.runInNewContext(source, context, { filename });
+    } catch {
+      // Error are propagated through the child compilation.
+      return null;
+    }
+
+    if (typeof context.resource === 'string') {
+      return context.resource;
+    } else if (typeof context.resource?.default === 'string') {
+      return context.resource.default;
+    }
 
-      throw new Error(`The loader "${outputName}" didn't return a string.`);
+    throw new Error(`The loader "${filename}" didn't return a string.`);
   }
 
-  get(filePath: string): Promise<string> {
-    return this._compile(filePath)
-      .then((result: CompilationOutput) => result.source);
+  async get(filePath: string): Promise<string> {
+    const normalizedFile = normalizePath(filePath);
+    let data = this.cache.get(normalizedFile);
+
+    if (data === undefined) {
+      // cache miss so compile resource
+      const compilationResult = await this._compile(filePath);
+      data = compilationResult.source;
+
+      // Only cache if compilation was successful
+      if (compilationResult.success) {
+        this.cache.set(normalizedFile, data);
+      }
+    }
+
+    return data;
   }
 }
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 75dd12d729ac..8ef1e71d453d 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports.ts b/packages/ngtools/webpack/src/transformers/elide_imports.ts
index d91b3c290fb9..2726a17be39f 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -48,7 +48,9 @@ export function elideImports(
 
     // Record import and skip
     if (ts.isImportDeclaration(node)) {
-      imports.push(node);
+      if (!node.importClause?.isTypeOnly) {
+        imports.push(node);
+      }
 
       return;
     }
@@ -116,6 +118,11 @@ export function elideImports(
   }
 
   const isUnused = (node: ts.Identifier) => {
+    // Do not remove JSX factory imports
+    if (node.text === compilerOptions.jsxFactory) {
+      return false;
+    }
+
     const symbol = typeChecker.getSymbolAtLocation(node);
 
     return symbol && !usedSymbols.has(symbol);
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
index fe76cc41aa2f..42d0810c50df 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -41,6 +41,18 @@ describe('@ngtools/webpack transformers', () => {
       'service.ts': `
         export class Service { }
       `,
+      'type.ts': `
+        export interface OnChanges {
+          ngOnChanges(changes: SimpleChanges): void;
+        }
+
+        export interface SimpleChanges {
+          [propName: string]: unknown;
+        }
+      `,
+      'jsx.ts': `
+        export function createElement() {}
+      `,
     };
 
     it('should remove unused imports', () => {
@@ -339,6 +351,47 @@ describe('@ngtools/webpack transformers', () => {
       });
     });
 
+    it('keeps jsxFactory imports when configured', () => {
+      const extraCompilerOptions: ts.CompilerOptions = {
+        jsxFactory: 'createElement',
+        experimentalDecorators: true,
+        jsx: ts.JsxEmit.React,
+      };
+
+      const input = tags.stripIndent`
+        import { Decorator } from './decorator';
+        import { Service } from './service';
+        import { createElement } from './jsx';
+
+        const test = <p>123</p>;
+
+        @Decorator()
+        export class Foo {
+          constructor(param: Service) {
+          }
+        }
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import { __decorate } from "tslib";
+        import { Decorator } from './decorator';
+        import { createElement } from './jsx';
+
+        const test = createElement("p", null, "123");
+
+        let Foo = class Foo { constructor(param) { } };
+        Foo = __decorate([ Decorator() ], Foo);
+        export { Foo };
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions, true);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
     describe('should not elide imports decorator type references when emitDecoratorMetadata is true', () => {
       const extraCompilerOptions: ts.CompilerOptions = {
          emitDecoratorMetadata: true,
@@ -530,6 +583,40 @@ describe('@ngtools/webpack transformers', () => {
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
 
+      it('should remove type-only imports', () => {
+        const input = tags.stripIndent`
+          import { Decorator } from './decorator';
+          import { Service } from './service';
+          import type { OnChanges, SimpleChanges } from './type';
+
+          @Decorator()
+          class Foo implements OnChanges {
+            constructor(param: Service) { }
+            ngOnChanges(changes: SimpleChanges) { }
+          }
+
+          ${dummyNode}
+        `;
+
+        const output = tags.stripIndent`
+          import { __decorate, __metadata } from "tslib";
+          import { Decorator } from './decorator';
+          import { Service } from './service';
+
+          let Foo = class Foo {
+            constructor(param) { }
+            ngOnChanges(changes) { }
+          };
+
+          Foo = __decorate([ Decorator(), __metadata("design:paramtypes", [Service]) ], Foo);
+        `;
+
+        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
+        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+        expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+      });
+
       describe('NGTSC - ShorthandPropertyAssignment to PropertyAssignment', () => {
         const transformShorthandPropertyAssignment = (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
           const visit: ts.Visitor = node => {
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 9898dc20b4a4..0cd4eee356f1 100644
--- a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
+++ b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/export_lazy_module_map_spec.ts b/packages/ngtools/webpack/src/transformers/export_lazy_module_map_spec.ts
index f485a0a93e47..f752d0cf2781 100644
--- a/packages/ngtools/webpack/src/transformers/export_lazy_module_map_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/export_lazy_module_map_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/export_ngfactory.ts b/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
index 6a5b13ee0426..083cfb79f671 100644
--- a/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
+++ b/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -58,10 +58,10 @@ export function exportNgFactory(
       const factoryClassName = entryModule.className + 'NgFactory';
       const factoryModulePath = normalizedEntryModulePath + '.ngfactory';
 
-      const namedExports = ts.createNamedExports([ts.createExportSpecifier(undefined,
-        ts.createIdentifier(factoryClassName))]);
-      const newImport = ts.createExportDeclaration(undefined, undefined, namedExports,
-        ts.createLiteral(factoryModulePath));
+      const namedExports = ts.factory.createNamedExports([ts.factory.createExportSpecifier(undefined,
+        ts.factory.createIdentifier(factoryClassName))]);
+      const newImport = ts.factory.createExportDeclaration(undefined, undefined, false, namedExports,
+        ts.factory.createStringLiteral(factoryModulePath));
 
       const firstNode = getFirstNode(sourceFile);
       if (firstNode) {
diff --git a/packages/ngtools/webpack/src/transformers/export_ngfactory_spec.ts b/packages/ngtools/webpack/src/transformers/export_ngfactory_spec.ts
index 1a92d4851dac..d0f84adbc8e6 100644
--- a/packages/ngtools/webpack/src/transformers/export_ngfactory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/export_ngfactory_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/find_resources.ts b/packages/ngtools/webpack/src/transformers/find_resources.ts
index 11ceeb92c7fd..391f4ea1a1b1 100644
--- a/packages/ngtools/webpack/src/transformers/find_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/find_resources.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/find_resources_spec.ts b/packages/ngtools/webpack/src/transformers/find_resources_spec.ts
index 0e0cf9cbaaa8..5dafe812d428 100644
--- a/packages/ngtools/webpack/src/transformers/find_resources_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/find_resources_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index 28257d847022..cb1c25572ea4 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -227,10 +227,10 @@ function replaceImport(
   const replacementVisitor: ts.Visitor = (node: ts.Node) => {
     if (node === importStringLit) {
       // Transform the import string.
-      return ts.createStringLiteral(newImportString);
+      return ts.factory.createStringLiteral(newImportString);
     } else if (node === exportNameId) {
       // Transform the export name.
-      return ts.createIdentifier(exportNameId.text + 'NgFactory');
+      return ts.factory.createIdentifier(exportNameId.text + 'NgFactory');
     }
 
     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
index 9a21797f0132..ea6bbe0b2fe1 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/index.ts b/packages/ngtools/webpack/src/transformers/index.ts
index 95ed09de0ce9..9b87dd36d555 100644
--- a/packages/ngtools/webpack/src/transformers/index.ts
+++ b/packages/ngtools/webpack/src/transformers/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/insert_import.ts b/packages/ngtools/webpack/src/transformers/insert_import.ts
index ebe0690f6680..79792845705f 100644
--- a/packages/ngtools/webpack/src/transformers/insert_import.ts
+++ b/packages/ngtools/webpack/src/transformers/insert_import.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -23,10 +23,10 @@ export function insertStarImport(
   // We don't need to verify if the symbol is already imported, star imports should be unique.
 
   // Create the new import node.
-  const namespaceImport = ts.createNamespaceImport(identifier);
-  const importClause = ts.createImportClause(undefined, namespaceImport);
-  const newImport = ts.createImportDeclaration(undefined, undefined, importClause,
-    ts.createLiteral(modulePath));
+  const namespaceImport = ts.factory.createNamespaceImport(identifier);
+  const importClause = ts.factory.createImportClause(false, undefined, namespaceImport);
+  const newImport = ts.factory.createImportDeclaration(undefined, undefined, importClause,
+    ts.factory.createStringLiteral(modulePath));
 
   if (target) {
     ops.push(new AddNodeOperation(
@@ -106,15 +106,15 @@ export function insertImport(
       sourceFile,
       maybeImports[0].elements[maybeImports[0].elements.length - 1],
       undefined,
-      ts.createImportSpecifier(undefined, ts.createIdentifier(symbolName)),
+      ts.factory.createImportSpecifier(undefined, ts.factory.createIdentifier(symbolName)),
     ));
   } else {
     // Create the new import node.
-    const namedImports = ts.createNamedImports([ts.createImportSpecifier(undefined,
-      ts.createIdentifier(symbolName))]);
-    const importClause = ts.createImportClause(undefined, namedImports);
-    const newImport = ts.createImportDeclaration(undefined, undefined, importClause,
-      ts.createLiteral(modulePath));
+    const namedImports = ts.factory.createNamedImports([ts.factory.createImportSpecifier(undefined,
+      ts.factory.createIdentifier(symbolName))]);
+    const importClause = ts.factory.createImportClause(false, undefined, namedImports);
+    const newImport = ts.factory.createImportDeclaration(undefined, undefined, importClause,
+      ts.factory.createStringLiteral(modulePath));
 
     if (allImports.length > 0) {
       // Find the last import and insert after.
diff --git a/packages/ngtools/webpack/src/transformers/interfaces.ts b/packages/ngtools/webpack/src/transformers/interfaces.ts
index 4eb35afcae88..1b1534ba02ce 100644
--- a/packages/ngtools/webpack/src/transformers/interfaces.ts
+++ b/packages/ngtools/webpack/src/transformers/interfaces.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/make_transform.ts b/packages/ngtools/webpack/src/transformers/make_transform.ts
index 2541d231b4f2..c7d7c188931e 100644
--- a/packages/ngtools/webpack/src/transformers/make_transform.ts
+++ b/packages/ngtools/webpack/src/transformers/make_transform.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/multiple_transformers_spec.ts b/packages/ngtools/webpack/src/transformers/multiple_transformers_spec.ts
index 5f9a8a42d156..2535b82f8389 100644
--- a/packages/ngtools/webpack/src/transformers/multiple_transformers_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/multiple_transformers_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/register_locale_data.ts b/packages/ngtools/webpack/src/transformers/register_locale_data.ts
index fd2aa2056603..91d2e2331c09 100644
--- a/packages/ngtools/webpack/src/transformers/register_locale_data.ts
+++ b/packages/ngtools/webpack/src/transformers/register_locale_data.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -66,7 +66,7 @@ export function registerLocaleData(
       }
 
       // Create the import node for the locale.
-      const localeNamespaceId = ts.createUniqueName('__NgCli_locale_');
+      const localeNamespaceId = ts.factory.createUniqueName('__NgCli_locale_');
       ops.push(...insertStarImport(
         sourceFile,
         localeNamespaceId,
@@ -76,19 +76,19 @@ export function registerLocaleData(
       ));
 
       // Create the import node for the registerLocaleData function.
-      const regIdentifier = ts.createIdentifier(`registerLocaleData`);
-      const regNamespaceId = ts.createUniqueName('__NgCli_locale_');
+      const regIdentifier = ts.factory.createIdentifier(`registerLocaleData`);
+      const regNamespaceId = ts.factory.createUniqueName('__NgCli_locale_');
       ops.push(
         ...insertStarImport(sourceFile, regNamespaceId, '@angular/common', firstNode, true),
       );
 
       // Create the register function call
-      const registerFunctionCall = ts.createCall(
-        ts.createPropertyAccess(regNamespaceId, regIdentifier),
+      const registerFunctionCall = ts.factory.createCallExpression(
+        ts.factory.createPropertyAccessExpression(regNamespaceId, regIdentifier),
         undefined,
-        [ts.createPropertyAccess(localeNamespaceId, 'default')],
+        [ts.factory.createPropertyAccessExpression(localeNamespaceId, 'default')],
       );
-      const registerFunctionStatement = ts.createStatement(registerFunctionCall);
+      const registerFunctionStatement = ts.factory.createExpressionStatement(registerFunctionCall);
 
       ops.push(new AddNodeOperation(
         sourceFile,
diff --git a/packages/ngtools/webpack/src/transformers/register_locale_data_spec.ts b/packages/ngtools/webpack/src/transformers/register_locale_data_spec.ts
index 3765bfcdb599..98d0845f5c79 100644
--- a/packages/ngtools/webpack/src/transformers/register_locale_data_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/register_locale_data_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts b/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts
index 343d6e978bfa..002b41239bb8 100644
--- a/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts
+++ b/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls_spec.ts b/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls_spec.ts
index 99145f97f53e..bd74983c39e5 100644
--- a/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/remove_decorators.ts b/packages/ngtools/webpack/src/transformers/remove_decorators.ts
index 7c0c72bdaf7c..d5b1d0abcf4c 100644
--- a/packages/ngtools/webpack/src/transformers/remove_decorators.ts
+++ b/packages/ngtools/webpack/src/transformers/remove_decorators.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/remove_decorators_spec.ts b/packages/ngtools/webpack/src/transformers/remove_decorators_spec.ts
index 9cd037c23048..cc9a52e049b3 100644
--- a/packages/ngtools/webpack/src/transformers/remove_decorators_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/remove_decorators_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
index 0153c8740d2d..d524f90e2fcb 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -74,8 +74,8 @@ export function replaceBootstrap(
 
       const platformBrowserDynamicIdentifier = innerCallExpr.expression as ts.Identifier;
 
-      const idPlatformBrowser = ts.createUniqueName('__NgCli_bootstrap_');
-      const idNgFactory = ts.createUniqueName('__NgCli_bootstrap_');
+      const idPlatformBrowser = ts.factory.createUniqueName('__NgCli_bootstrap_');
+      const idNgFactory = ts.factory.createUniqueName('__NgCli_bootstrap_');
 
       // Add the transform operations.
       const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
@@ -93,13 +93,13 @@ export function replaceBootstrap(
         // Replace the entry module import.
         ...insertStarImport(sourceFile, idNgFactory, modulePath),
         new ReplaceNodeOperation(sourceFile, entryModuleIdentifier,
-          ts.createPropertyAccess(idNgFactory, ts.createIdentifier(className))),
+          ts.factory.createPropertyAccessExpression(idNgFactory, ts.factory.createIdentifier(className))),
         // Replace the platformBrowserDynamic import.
         ...insertStarImport(sourceFile, idPlatformBrowser, '@angular/platform-browser'),
         new ReplaceNodeOperation(sourceFile, platformBrowserDynamicIdentifier,
-          ts.createPropertyAccess(idPlatformBrowser, 'platformBrowser')),
+          ts.factory.createPropertyAccessExpression(idPlatformBrowser, 'platformBrowser')),
         new ReplaceNodeOperation(sourceFile, bootstrapModuleIdentifier,
-          ts.createIdentifier(bootstrapIdentifier)),
+          ts.factory.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 2a9afa19952c..481232c5ea1a 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index 8ae31104160e..98bae4ae1190 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -16,15 +16,17 @@ export function replaceResources(
     const typeChecker = getTypeChecker();
     const resourceImportDeclarations: ts.ImportDeclaration[] = [];
     const moduleKind = context.getCompilerOptions().module;
+    const nodeFactory = context.factory;
+
     const visitNode: ts.Visitor = (node: ts.Node) => {
       if (ts.isClassDeclaration(node)) {
         const decorators = ts.visitNodes(node.decorators, node =>
           ts.isDecorator(node)
-            ? visitDecorator(node, typeChecker, directTemplateLoading, resourceImportDeclarations, moduleKind)
+            ? visitDecorator(nodeFactory, node, typeChecker, directTemplateLoading, resourceImportDeclarations, moduleKind)
             : node,
         );
 
-        return ts.updateClassDeclaration(
+        return nodeFactory.updateClassDeclaration(
           node,
           decorators,
           node.modifiers,
@@ -46,10 +48,10 @@ export function replaceResources(
       const updatedSourceFile = ts.visitNode(sourceFile, visitNode);
       if (resourceImportDeclarations.length) {
         // Add resource imports
-        return ts.updateSourceFileNode(
+        return context.factory.updateSourceFile(
           updatedSourceFile,
           ts.setTextRange(
-            ts.createNodeArray([
+            context.factory.createNodeArray([
               ...resourceImportDeclarations,
               ...updatedSourceFile.statements,
             ]),
@@ -64,6 +66,7 @@ export function replaceResources(
 }
 
 function visitDecorator(
+  nodeFactory: ts.NodeFactory,
   node: ts.Decorator,
   typeChecker: ts.TypeChecker,
   directTemplateLoading: boolean,
@@ -91,29 +94,30 @@ function visitDecorator(
   // visit all properties
   let properties = ts.visitNodes(objectExpression.properties, node =>
     ts.isObjectLiteralElementLike(node)
-      ? visitComponentMetadata(node, styleReplacements, directTemplateLoading, resourceImportDeclarations, moduleKind)
+      ? visitComponentMetadata(nodeFactory, node, styleReplacements, directTemplateLoading, resourceImportDeclarations, moduleKind)
       : node,
   );
 
   // replace properties with updated properties
   if (styleReplacements.length > 0) {
-    const styleProperty = ts.createPropertyAssignment(
-      ts.createIdentifier('styles'),
-      ts.createArrayLiteral(styleReplacements),
+    const styleProperty = nodeFactory.createPropertyAssignment(
+      nodeFactory.createIdentifier('styles'),
+      nodeFactory.createArrayLiteralExpression(styleReplacements),
     );
 
-    properties = ts.createNodeArray([...properties, styleProperty]);
+    properties = nodeFactory.createNodeArray([...properties, styleProperty]);
   }
 
-  return ts.updateDecorator(
+  return nodeFactory.updateDecorator(
     node,
-    ts.updateCall(decoratorFactory, decoratorFactory.expression, decoratorFactory.typeArguments, [
-      ts.updateObjectLiteral(objectExpression, properties),
+    nodeFactory.updateCallExpression(decoratorFactory, decoratorFactory.expression, decoratorFactory.typeArguments, [
+      nodeFactory.updateObjectLiteralExpression(objectExpression, properties),
     ]),
   );
 }
 
 function visitComponentMetadata(
+  nodeFactory: ts.NodeFactory,
   node: ts.ObjectLiteralElementLike,
   styleReplacements: ts.Expression[],
   directTemplateLoading: boolean,
@@ -131,6 +135,7 @@ function visitComponentMetadata(
 
     case 'templateUrl':
       const importName = createResourceImport(
+        nodeFactory,
         node.initializer,
         directTemplateLoading ? '!raw-loader!' : '',
         resourceImportDeclarations,
@@ -140,9 +145,9 @@ function visitComponentMetadata(
         return node;
       }
 
-      return ts.updatePropertyAssignment(
+      return nodeFactory.updatePropertyAssignment(
         node,
-        ts.createIdentifier('template'),
+        nodeFactory.createIdentifier('template'),
         importName,
       );
     case 'styles':
@@ -158,10 +163,10 @@ function visitComponentMetadata(
         }
 
         if (isInlineStyles) {
-          return ts.createLiteral(node.text);
+          return nodeFactory.createStringLiteral(node.text);
         }
 
-        return createResourceImport(node, undefined, resourceImportDeclarations, moduleKind) || node;
+        return createResourceImport(nodeFactory, node, undefined, resourceImportDeclarations, moduleKind) || node;
       });
 
       // Styles should be placed first
@@ -200,6 +205,7 @@ function isComponentDecorator(node: ts.Node, typeChecker: ts.TypeChecker): node
 }
 
 function createResourceImport(
+  nodeFactory: ts.NodeFactory,
   node: ts.Node,
   loader: string | undefined,
   resourceImportDeclarations: ts.ImportDeclaration[],
@@ -210,23 +216,23 @@ function createResourceImport(
     return null;
   }
 
-  const urlLiteral = ts.createLiteral(url);
+  const urlLiteral = nodeFactory.createStringLiteral(url);
 
   if (moduleKind < ts.ModuleKind.ES2015) {
-    return ts.createPropertyAccess(
-      ts.createCall(
-        ts.createIdentifier('require'),
+    return nodeFactory.createPropertyAccessExpression(
+      nodeFactory.createCallExpression(
+        nodeFactory.createIdentifier('require'),
         [],
         [urlLiteral],
       ),
       'default',
     );
   } else {
-    const importName = ts.createIdentifier(`__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`);
-    resourceImportDeclarations.push(ts.createImportDeclaration(
+    const importName = nodeFactory.createIdentifier(`__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`);
+    resourceImportDeclarations.push(nodeFactory.createImportDeclaration(
       undefined,
       undefined,
-      ts.createImportClause(importName, undefined),
+      nodeFactory.createImportClause(false, importName, undefined),
       urlLiteral,
     ));
 
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
index c07660351a15..b157019693ba 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
index e9fcee0b748e..cfdb944c5710 100644
--- a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -79,21 +79,21 @@ export function replaceServerBootstrap(
 
           const platformDynamicServerIdentifier = innerCallExpr.expression as ts.Identifier;
 
-          const idPlatformServer = ts.createUniqueName('__NgCli_bootstrap_');
-          const idNgFactory = ts.createUniqueName('__NgCli_bootstrap_');
+          const idPlatformServer = ts.factory.createUniqueName('__NgCli_bootstrap_');
+          const idNgFactory = ts.factory.createUniqueName('__NgCli_bootstrap_');
 
           // Add the transform operations.
           ops.push(
             // Replace the entry module import.
             ...insertStarImport(sourceFile, idNgFactory, factoryModulePath),
             new ReplaceNodeOperation(sourceFile, entryModuleIdentifier,
-              ts.createPropertyAccess(idNgFactory, ts.createIdentifier(factoryClassName))),
+              ts.factory.createPropertyAccessExpression(idNgFactory, ts.factory.createIdentifier(factoryClassName))),
             // Replace the platformBrowserDynamic import.
             ...insertStarImport(sourceFile, idPlatformServer, '@angular/platform-server'),
             new ReplaceNodeOperation(sourceFile, platformDynamicServerIdentifier,
-              ts.createPropertyAccess(idPlatformServer, 'platformServer')),
+              ts.factory.createPropertyAccessExpression(idPlatformServer, 'platformServer')),
             new ReplaceNodeOperation(sourceFile, bootstrapModuleIdentifier,
-              ts.createIdentifier('bootstrapModuleFactory')),
+              ts.factory.createIdentifier('bootstrapModuleFactory')),
           );
         } else if (callExpr.expression.kind === ts.SyntaxKind.Identifier) {
           // Figure out if it is renderModule
@@ -106,30 +106,30 @@ export function replaceServerBootstrap(
 
           const renderModuleIdentifier = identifierExpr as ts.Identifier;
 
-          const idPlatformServer = ts.createUniqueName('__NgCli_bootstrap_');
-          const idNgFactory = ts.createUniqueName('__NgCli_bootstrap_');
+          const idPlatformServer = ts.factory.createUniqueName('__NgCli_bootstrap_');
+          const idNgFactory = ts.factory.createUniqueName('__NgCli_bootstrap_');
 
           ops.push(
             // Replace the entry module import.
             ...insertStarImport(sourceFile, idNgFactory, factoryModulePath),
             new ReplaceNodeOperation(sourceFile, entryModuleIdentifier,
-              ts.createPropertyAccess(idNgFactory, ts.createIdentifier(factoryClassName))),
+              ts.factory.createPropertyAccessExpression(idNgFactory, ts.factory.createIdentifier(factoryClassName))),
             // Replace the renderModule import.
             ...insertStarImport(sourceFile, idPlatformServer, '@angular/platform-server'),
             new ReplaceNodeOperation(sourceFile, renderModuleIdentifier,
-              ts.createPropertyAccess(idPlatformServer, 'renderModuleFactory')),
+              ts.factory.createPropertyAccessExpression(idPlatformServer, 'renderModuleFactory')),
           );
         }
       } else if (entryModuleIdentifier.parent.kind === ts.SyntaxKind.PropertyAssignment) {
         // This is for things that accept a module as a property in a config object
         // .ie the express engine
 
-        const idNgFactory = ts.createUniqueName('__NgCli_bootstrap_');
+        const idNgFactory = ts.factory.createUniqueName('__NgCli_bootstrap_');
 
         ops.push(
           ...insertStarImport(sourceFile, idNgFactory, factoryModulePath),
           new ReplaceNodeOperation(sourceFile, entryModuleIdentifier,
-            ts.createPropertyAccess(idNgFactory, ts.createIdentifier(factoryClassName))),
+            ts.factory.createPropertyAccessExpression(idNgFactory, ts.factory.createIdentifier(factoryClassName))),
         );
       }
     });
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 bd7b51fdcc9d..0ddb849bccfd 100644
--- a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/transformers/spec_helpers.ts b/packages/ngtools/webpack/src/transformers/spec_helpers.ts
index c2c3ba06c852..40711899b962 100644
--- a/packages/ngtools/webpack/src/transformers/spec_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/spec_helpers.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -14,7 +14,7 @@ import { WebpackCompilerHost } from '../compiler_host';
 
 // Test transform helpers.
 const basePath = '/project/src/';
-const fileName = basePath + 'test-file.ts';
+const basefileName = basePath + 'test-file.ts';
 const typeScriptLibFiles = loadTypeScriptLibFiles();
 const tsLibFiles = loadTsLibFiles();
 
@@ -23,7 +23,9 @@ export function createTypescriptContext(
   additionalFiles?: Record<string, string>,
   useLibs = false,
   extraCompilerOptions: ts.CompilerOptions = {},
+  jsxFile = false,
 ) {
+  const fileName = basefileName + (jsxFile ? 'x' : '');
   // Set compiler options.
   const compilerOptions: ts.CompilerOptions = {
     noEmitOnError: useLibs,
@@ -107,7 +109,7 @@ export function transformTypescript(
   }
 
   // Return the transpiled js.
-  return compilerHost.readFile(fileName.replace(/\.tsx?$/, '.js'));
+  return compilerHost.readFile(basefileName.replace(/\.tsx?$/, '.js'));
 }
 
 function loadTypeScriptLibFiles(): Record<string, string> {
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index ea50676bc10c..afc448483f08 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/type_checker_bootstrap.js b/packages/ngtools/webpack/src/type_checker_bootstrap.js
index da95c57aaca5..006b4478c740 100644
--- a/packages/ngtools/webpack/src/type_checker_bootstrap.js
+++ b/packages/ngtools/webpack/src/type_checker_bootstrap.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/type_checker_messages.ts b/packages/ngtools/webpack/src/type_checker_messages.ts
index d42c0492d6c0..670985fc7f74 100644
--- a/packages/ngtools/webpack/src/type_checker_messages.ts
+++ b/packages/ngtools/webpack/src/type_checker_messages.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/type_checker_worker.ts b/packages/ngtools/webpack/src/type_checker_worker.ts
index 488f34b24e84..6036d098a0bd 100644
--- a/packages/ngtools/webpack/src/type_checker_worker.ts
+++ b/packages/ngtools/webpack/src/type_checker_worker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/utils.ts b/packages/ngtools/webpack/src/utils.ts
index 3b21d591ed36..17f121c261ac 100644
--- a/packages/ngtools/webpack/src/utils.ts
+++ b/packages/ngtools/webpack/src/utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/utils_spec.ts b/packages/ngtools/webpack/src/utils_spec.ts
index 6da7940a0eb7..70a02669cb7d 100644
--- a/packages/ngtools/webpack/src/utils_spec.ts
+++ b/packages/ngtools/webpack/src/utils_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
index 65ad145b3c5a..ec413cd558b2 100644
--- a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
+++ b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/webpack-diagnostics.ts b/packages/ngtools/webpack/src/webpack-diagnostics.ts
index d7ea3b4c44d6..43897ba03c0a 100644
--- a/packages/ngtools/webpack/src/webpack-diagnostics.ts
+++ b/packages/ngtools/webpack/src/webpack-diagnostics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/webpack-input-host.ts b/packages/ngtools/webpack/src/webpack-input-host.ts
index 9fb36a0be029..f3ee4d22022a 100644
--- a/packages/ngtools/webpack/src/webpack-input-host.ts
+++ b/packages/ngtools/webpack/src/webpack-input-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/webpack-version.ts b/packages/ngtools/webpack/src/webpack-version.ts
index db2760083367..46a602b7c1af 100644
--- a/packages/ngtools/webpack/src/webpack-version.ts
+++ b/packages/ngtools/webpack/src/webpack-version.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/ngtools/webpack/src/webpack.ts b/packages/ngtools/webpack/src/webpack.ts
index 547ded545824..1e716660bf2e 100644
--- a/packages/ngtools/webpack/src/webpack.ts
+++ b/packages/ngtools/webpack/src/webpack.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index 5afa57a707ad..fc13fed3c0bb 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 16c7d3e756ec..2049c2c8147c 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/application/files/karma.conf.js.template b/packages/schematics/angular/application/files/karma.conf.js.template
index d9c1c9a1c255..ecfc22f61514 100644
--- a/packages/schematics/angular/application/files/karma.conf.js.template
+++ b/packages/schematics/angular/application/files/karma.conf.js.template
@@ -13,15 +13,24 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageReporter: {
       dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= appName%>'),
       subdir: '.',
       reporters: [
         { type: 'html' },
         { type: 'text-summary' }
-      ],
+      ]
     },
     reporters: ['progress', 'kjhtml'],
     port: 9876,
diff --git a/packages/schematics/angular/application/files/src/polyfills.ts.template b/packages/schematics/angular/application/files/src/polyfills.ts.template
index 9b8f300ef68a..d5f67bd91069 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts.template
+++ b/packages/schematics/angular/application/files/src/polyfills.ts.template
@@ -18,7 +18,9 @@
  * BROWSER POLYFILLS
  */
 
-/** IE11 requires the following for NgClass support on SVG elements */
+/**
+ * IE11 requires the following for NgClass support on SVG elements
+ */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index d6fe283d5ebe..8ba5d17f3bb2 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -103,10 +103,10 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
     || options.minimal
     || options.style !== Style.Css) {
     const componentSchematicsOptions: JsonObject = {};
-    if (options.inlineTemplate || options.minimal) {
+    if (options.inlineTemplate ?? options.minimal) {
       componentSchematicsOptions.inlineTemplate = true;
     }
-    if (options.inlineStyle || options.minimal) {
+    if (options.inlineStyle ?? options.minimal) {
       componentSchematicsOptions.inlineStyle = true;
     }
     if (options.style && options.style !== Style.Css) {
@@ -289,10 +289,11 @@ export default function (options: ApplicationOptions): Rule {
         viewEncapsulation: options.viewEncapsulation,
       } :
       {
-        inlineStyle: true,
-        inlineTemplate: true,
+        inlineStyle: options.inlineStyle ?? true,
+        inlineTemplate: options.inlineTemplate ?? true,
         skipTests: true,
         style: options.style,
+        viewEncapsulation: options.viewEncapsulation,
       };
 
     const workspace = await getWorkspace(host);
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 4fbd54846756..1b66324c4430 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { JsonParseMode, parseJson } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { latestVersions } from '../utility/latest-versions';
 import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -15,7 +15,7 @@ import { Schema as ApplicationOptions, Style, ViewEncapsulation } from './schema
 
 // tslint:disable-next-line: no-any
 function readJsonFile(tree: UnitTestTree, path: string): any {
-  return parseJson(tree.readContent(path).toString(), JsonParseMode.Loose);
+  return parseJson(tree.readContent(path).toString());
 }
 
 describe('Application Schematic', () => {
@@ -32,8 +32,6 @@ describe('Application Schematic', () => {
 
   const defaultOptions: ApplicationOptions = {
     name: 'foo',
-    inlineStyle: false,
-    inlineTemplate: false,
     routing: false,
     skipPackageJson: false,
   };
@@ -206,6 +204,30 @@ describe('Application Schematic', () => {
     });
   });
 
+  it('minimal=true allows inlineStyle=false when configuring the schematics options for components', async () => {
+    const options = { ...defaultOptions, minimal: true, inlineStyle: false };
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const config = JSON.parse(tree.readContent('/angular.json'));
+    const schematics = config.projects.foo.schematics;
+    expect(schematics['@schematics/angular:component']).toEqual({
+      inlineTemplate: true,
+      skipTests: true,
+    });
+  });
+
+  it('minimal=true allows inlineTemplate=false when configuring the schematics options for components', async () => {
+    const options = { ...defaultOptions, minimal: true, inlineTemplate: false };
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const config = JSON.parse(tree.readContent('/angular.json'));
+    const schematics = config.projects.foo.schematics;
+    expect(schematics['@schematics/angular:component']).toEqual({
+      inlineStyle: true,
+      skipTests: true,
+    });
+  });
+
   it('should create correct files when using minimal', async () => {
     const options = { ...defaultOptions, minimal: true };
     const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
@@ -235,6 +257,64 @@ describe('Application Schematic', () => {
     ]));
   });
 
+  it('should create correct files when using minimal and inlineStyle=false', async () => {
+    const options = { ...defaultOptions, minimal: true, inlineStyle: false };
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const files = tree.files;
+    [
+      '/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.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.css',
+      '/projects/foo/src/app/app.component.ts',
+    ]));
+  });
+
+  it('should create correct files when using minimal and inlineTemplate=false', async () => {
+    const options = { ...defaultOptions, minimal: true, inlineTemplate: false };
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const files = tree.files;
+    [
+      '/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.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.html',
+      '/projects/foo/src/app/app.component.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/application/other-files/app.component.html.template b/packages/schematics/angular/application/other-files/app.component.html.template
index 5ce36a2aaea1..d1046f40e1bd 100644
--- a/packages/schematics/angular/application/other-files/app.component.html.template
+++ b/packages/schematics/angular/application/other-files/app.component.html.template
@@ -52,11 +52,17 @@
   }
 
   .toolbar #twitter-logo {
+    height: 40px;
+    margin: 0 8px;
+  }
+
+  .toolbar #youtube-logo {
     height: 40px;
     margin: 0 16px;
   }
 
-  .toolbar #twitter-logo:hover {
+  .toolbar #twitter-logo:hover,
+  .toolbar #youtube-logo:hover {
     opacity: 0.8;
   }
 
@@ -313,6 +319,12 @@
         <path d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23" fill="#fff"/>
       </svg>
     </a>
+    <a aria-label="Angular on YouTube" target="_blank" rel="noopener" href="https://youtube.com/angular" title="YouTube">
+      <svg id="youtube-logo" height="24" width="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#fff">
+        <path d="M0 0h24v24H0V0z" fill="none"/>
+        <path d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"/>
+      </svg>
+    </a>
 </div>
 
 <div class="content" role="main">
@@ -320,7 +332,8 @@
   <!-- Highlight Card -->
   <div class="card highlight-card card-small">
 
-    <svg id="rocket" alt="Rocket Ship" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678">
+    <svg id="rocket" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678">
+      <title>Rocket Ship</title>
       <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)">
         <circle id="Ellipse_8" data-name="Ellipse 8" cx="50.839" cy="50.839" r="50.839" transform="translate(141 696)" fill="#dd0031"/>
         <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)">
@@ -332,7 +345,8 @@
 
     <span>{{ title }} app is running!</span>
 
-    <svg id="rocket-smoke" alt="Rocket Ship Smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632">
+    <svg id="rocket-smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632">
+      <title>Rocket Ship Smoke</title>
       <path id="Path_40" data-name="Path 40" d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z" transform="translate(-147.025 -140.939)" fill="#f5f5f5"/>
     </svg>
 
@@ -435,7 +449,8 @@
     </a>
 
     <a class="circle-link" title="CLI" href="https://cli.angular.io/" target="_blank" rel="noopener">
-      <svg alt="Angular CLI Logo" xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447">
+      <svg xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447">
+        <title>Angular CLI Logo</title>
         <g id="Group_21" data-name="Group 21" transform="translate(0)">
           <path id="Path_20" data-name="Path 20" d="M2660.313,313.618h0l-10.833,3.9,1.637,14.4,9.2,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-2649.48 -313.618)" fill="#37474f"/>
           <path id="Path_21" data-name="Path 21" d="M2741.883,313.618v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-2731.05 -313.618)" fill="#263238"/>
@@ -446,30 +461,9 @@
       </svg>
     </a>
 
-    <a class="circle-link" title="Augury" href="https://augury.rangle.io/" target="_blank" rel="noopener">
-      <svg alt="Angular Augury Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21.81" height="23.447" viewBox="0 0 21.81 23.447">
-        <defs>
-          <clipPath id="clip-path">
-            <rect id="Rectangle_13" data-name="Rectangle 13" width="10.338" height="10.27" fill="none"/>
-          </clipPath>
-        </defs>
-        <g id="Group_25" data-name="Group 25" transform="translate(0)">
-          <path id="Path_24" data-name="Path 24" d="M3780.155,311.417h0l-10.881,3.9,1.637,14.4,9.244,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-3769.274 -311.417)" fill="#4a3493"/>
-          <path id="Path_25" data-name="Path 25" d="M3862.088,311.417v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-3851.207 -311.417)" fill="#311b92"/>
-          <g id="Group_24" data-name="Group 24" transform="translate(6.194 6.73)" opacity="0.5">
-            <g id="Group_23" data-name="Group 23" transform="translate(0 0)">
-              <g id="Group_22" data-name="Group 22" clip-path="url(#clip-path)">
-                <path id="Path_26" data-name="Path 26" d="M3832.4,373.252a5.168,5.168,0,1,1-5.828-4.383,5.216,5.216,0,0,1,2.574.3,3.017,3.017,0,1,0,3.252,4.086Z" transform="translate(-3822.107 -368.821)" fill="#fff"/>
-              </g>
-            </g>
-          </g>
-          <path id="Path_27" data-name="Path 27" d="M3830.582,370.848a5.162,5.162,0,1,1-3.254-4.086,3.017,3.017,0,1,0,3.252,4.086Z" transform="translate(-3814.311 -359.969)" fill="#fff"/>
-        </g>
-      </svg>
-    </a>
-
     <a class="circle-link" title="Protractor" href="https://www.protractortest.org/" target="_blank" rel="noopener">
-      <svg alt="Angular Protractor Logo" xmlns="http://www.w3.org/2000/svg" width="21.81" height="23.447" viewBox="0 0 21.81 23.447">
+      <svg xmlns="http://www.w3.org/2000/svg" width="21.81" height="23.447" viewBox="0 0 21.81 23.447">
+        <title>Angular Protractor Logo</title>
         <g id="Group_26" data-name="Group 26" transform="translate(0)">
           <path id="Path_28" data-name="Path 28" d="M4620.155,311.417h0l-10.881,3.9,1.637,14.4,9.244,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-4609.274 -311.417)" fill="#e13439"/>
           <path id="Path_29" data-name="Path 29" d="M4702.088,311.417v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-4691.207 -311.417)" fill="#b52f32"/>
@@ -479,24 +473,17 @@
     </a>
 
     <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener">
-      <svg alt="Meetup Logo" xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447">
+      <svg xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447">
+        <title>Meetup Logo</title>
         <path id="logo--mSwarm" d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z" transform="translate(0 0.123)" fill="#f64060"/>
       </svg>
     </a>
 
-    <a class="circle-link" title="Join the Conversation on Gitter" href="https://gitter.im/angular/angular" target="_blank" rel="noopener">
-      <svg alt="Gitter Logo" xmlns="http://www.w3.org/2000/svg" width="19.447" height="19.447" viewBox="0 0 19.447 19.447">
-        <g id="Group_40" data-name="Group 40" transform="translate(-1612 -405)">
-          <rect id="Rectangle_19" data-name="Rectangle 19" width="19.447" height="19.447" transform="translate(1612 405)" fill="#e60257"/>
-          <g id="gitter" transform="translate(1617.795 408.636)">
-            <g id="Group_33" data-name="Group 33" transform="translate(0 0)">
-              <rect id="Rectangle_15" data-name="Rectangle 15" width="1.04" height="9.601" transform="translate(2.304 2.324)" fill="#fff"/>
-              <rect id="Rectangle_16" data-name="Rectangle 16" width="1.04" height="9.601" transform="translate(4.607 2.324)" fill="#fff"/>
-              <rect id="Rectangle_17" data-name="Rectangle 17" width="1.04" height="4.648" transform="translate(6.91 2.324)" fill="#fff"/>
-              <rect id="Rectangle_18" data-name="Rectangle 18" width="1.04" height="6.971" transform="translate(0 0)" fill="#fff"/>
-            </g>
-          </g>
-        </g>
+    <a class="circle-link" title="Join the Conversation on Discord" href="https://discord.gg/angular" target="_blank" rel="noopener">
+      <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240">
+        <title>Discord Logo</title>
+        <path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/>
+        <path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/>
       </svg>
     </a>
   </div>
@@ -515,7 +502,8 @@
       </a>
   </footer>
 
-  <svg id="clouds" alt="Gray Clouds Background" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677">
+  <svg id="clouds" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677">
+    <title>Gray Clouds Background</title>
     <path id="Path_39" data-name="Path 39" d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z" transform="translate(142.69 -634.312)" fill="#eee"/>
   </svg>
 
@@ -528,7 +516,5 @@
 <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
 <!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
 <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-
 <% if (routing) { %>
-<router-outlet></router-outlet><% } %>
\ No newline at end of file
+<router-outlet></router-outlet><% } %>
diff --git a/packages/schematics/angular/application/other-files/app.module.ts.template b/packages/schematics/angular/application/other-files/app.module.ts.template
index 2c4bc05c64e6..88ee10b8a0e8 100644
--- a/packages/schematics/angular/application/other-files/app.module.ts.template
+++ b/packages/schematics/angular/application/other-files/app.module.ts.template
@@ -1,5 +1,5 @@
-import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 <% if (routing) { %>
 import { AppRoutingModule } from './app-routing.module';<% } %>
 import { AppComponent } from './app.component';
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index d96ee6824f78..967d3441308a 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -20,28 +20,26 @@
       "x-prompt": "What name would you like to use for the application?"
     },
     "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": "Include 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",
       "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. ",
+      "description": "Include 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",
       "x-user-analytics": 10
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new app.",
-      "enum": ["Emulated", "Native", "None", "ShadowDom"],
+      "enum": ["Emulated", "None", "ShadowDom"],
       "type": "string",
       "x-user-analytics": 11
     },
     "routing": {
       "type": "boolean",
-      "description": "When true, creates a routing NgModule.",
+      "description": "Create a routing NgModule.",
       "default": false,
       "x-prompt": "Would you like to add Angular routing?",
       "x-user-analytics": 17
@@ -78,7 +76,7 @@
       "x-user-analytics": 5
     },
     "skipTests": {
-      "description": "When true, does not create \"spec.ts\" test files for the app.",
+      "description": "Do not create \"spec.ts\" test files for the application.",
       "type": "boolean",
       "default": false,
       "alias": "S",
@@ -87,10 +85,10 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file."
+      "description": "Do 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.)",
+      "description": "Create a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false,
       "x-user-analytics": 14
@@ -102,8 +100,7 @@
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the application.",
+      "description": "Apply lint fixes after generating the application.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     },
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index d01184b655a8..5db79902d35a 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 {
   Rule,
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 674d083d759d..878c4f419884 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 8a5aaec5515d..890737cfa5a3 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -29,7 +29,7 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new class.",
+      "description": "Do not create \"spec.ts\" test files for the new class.",
       "default": false,
       "x-user-analytics": 12
     },
@@ -41,7 +41,7 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the class.",
+      "description": "Apply lint fixes after generating the class.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json
index 6a2d5dfe4f6c..13e656267c61 100755
--- a/packages/schematics/angular/collection.json
+++ b/packages/schematics/angular/collection.json
@@ -12,8 +12,8 @@
       "description": "Create an Angular workspace.",
       "hidden": true
     },
-    "serviceWorker": {
-      "aliases": [ "service-worker" ],
+    "service-worker": {
+      "aliases": [ "serviceWorker" ],
       "factory": "./service-worker",
       "description": "Initializes a service worker setup.",
       "schema": "./service-worker/schema.json"
@@ -101,8 +101,8 @@
       "schema": "./universal/schema.json",
       "hidden": true
     },
-    "appShell": {
-      "aliases": [ "app-shell" ],
+    "app-shell": {
+      "aliases": [ "appShell" ],
       "factory": "./app-shell",
       "description": "Create an app shell.",
       "schema": "./app-shell/schema.json"
@@ -113,8 +113,8 @@
       "schema": "./library/schema.json",
       "description": "Generate a library project for Angular."
     },
-    "webWorker": {
-      "aliases": ["web-worker"],
+    "web-worker": {
+      "aliases": ["webWorker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index be969b414c9c..84a5ac04b963 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -158,14 +158,12 @@ export default function (options: ComponentOptions): Rule {
         ...options,
       }),
       !options.type ? forEach((file => {
-        if (!!file.path.match(new RegExp('..'))) {
-          return {
+        return file.path.includes('..')
+          ? {
             content: file.content,
             path: file.path.replace('..', '.'),
-          };
-        } else {
-          return file;
-        }
+          }
+          : file;
       }) as FileOperator) : noop(),
       move(parsedPath.path),
     ]);
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 06f8aaaf203a..819d9401dde7 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -145,7 +145,7 @@ describe('Component Schematic', () => {
 
     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\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*)  FooComponent\n\1\]/);
   });
 
   it('should set the entry component', async () => {
@@ -153,7 +153,7 @@ describe('Component Schematic', () => {
 
     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\]/);
+    expect(appModuleContent).toMatch(/entryComponents: \[\n(\s*)  FooComponent\n\1\]/);
   });
 
   it('should import into a specified module', async () => {
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 474c6035ae43..d01557bcdbb5 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -34,14 +34,14 @@
       "alias": "b"
     },
     "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": "Include 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",
       "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.",
+      "description": "Include 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",
@@ -49,7 +49,7 @@
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new component.",
-      "enum": ["Emulated", "Native", "None", "ShadowDom"],
+      "enum": ["Emulated", "None", "ShadowDom"],
       "type": "string",
       "alias": "v",
       "x-user-analytics": 11
@@ -95,18 +95,18 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new component.",
+      "description": "Do not create \"spec.ts\" test files for the new component.",
       "default": false,
       "x-user-analytics": 12
     },
     "flat": {
       "type": "boolean",
-      "description": "When true, creates the new files at the top level of the current project.",
+      "description": "Create the new files at the top level of the current project.",
       "default": false
     },
     "skipImport": {
       "type": "boolean",
-      "description": "When true, does not import this component into the owning NgModule.",
+      "description": "Do not import this component into the owning NgModule.",
       "default": false,
       "x-user-analytics": 18
     },
@@ -128,19 +128,18 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this component.",
+      "description": "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": "The new component is the entry component of the declaring NgModule.",
       "x-deprecated": "Since version 9.0.0 with Ivy, entryComponents is no longer necessary."
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the component.",
+      "description": "Apply lint fixes after generating the component.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 056455fb6b3b..a8a859a8208a 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 {
   Rule,
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index 167afe6bbf4f..add3a43b38d4 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -93,7 +93,7 @@ describe('Directive Schematic', () => {
     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\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*)  FooDirective\n\1\]/);
   });
 
   it('should import into a specified module', async () => {
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index 0d1f20323f83..c06f95c9552d 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -43,13 +43,13 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new class.",
+      "description": "Do not create \"spec.ts\" test files for the new class.",
       "default": false,
       "x-user-analytics": 12
     },
     "skipImport": {
       "type": "boolean",
-      "description": "When true, does not import this directive into the owning NgModule.",
+      "description": "Do not import this directive into the owning NgModule.",
       "default": false,
       "x-user-analytics": 18
     },
@@ -71,13 +71,12 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this directive.",
+      "description": "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": "Apply lint fixes after generating the directive.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
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 ff74d504d21d..a6cfbf93e2f1 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
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
 import { browser, logging } from 'protractor';
+import { AppPage } from './app.po';
 
 describe('workspace-project App', () => {
   let page: AppPage;
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 2e6f56bb78e5..57e961be4058 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index fb63f66adea4..0e5738991c2f 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 6219358cba41..8f8bbc87a781 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 {
   Rule,
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index a6992409f914..fcc8632adacb 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index 550e25cb97af..9ef6464b7d93 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -29,8 +29,7 @@
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the enum.",
+      "description": "Apply lint fixes after generating the enum.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template
index e41530b35898..3dc36a017893 100644
--- a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template
+++ b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { <%= implementationImports %>ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { <%= implementationImports %> } from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 6f82bac6600c..b83b52fbc1f1 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 {
   Rule,
@@ -38,12 +38,25 @@ export default function (options: GuardOptions): Rule {
     const implementations = options.implements
       .map(implement => implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement)
       .join(', ');
-    let implementationImports = `${options.implements.join(', ')}, `;
-    // As long as we aren't in IE... ;)
+    const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
+    const routerNamedImports: string[] = [...options.implements, 'UrlTree'];
+
     if (options.implements.includes(GuardInterface.CanLoad)) {
-      implementationImports = `${implementationImports}Route, UrlSegment, `;
+      routerNamedImports.push(
+        'Route',
+        'UrlSegment',
+      );
+
+      if (options.implements.length > 1) {
+        routerNamedImports.push(...commonRouterNameImports);
+      }
+    } else {
+      routerNamedImports.push(...commonRouterNameImports);
     }
 
+    routerNamedImports.sort();
+
+    const implementationImports = routerNamedImports.join(', ');
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 01740b088f1f..1c76d6406da8 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -37,12 +37,14 @@ describe('Guard Schematic', () => {
   let appTree: UnitTestTree;
   beforeEach(async () => {
     appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('application', appOptions, appTree)
       .toPromise();
   });
 
   it('should create a guard', async () => {
-    const tree = await schematicRunner.runSchematicAsync('guard', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('guard', defaultOptions, appTree)
       .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.guard.spec.ts');
@@ -52,8 +54,7 @@ describe('Guard Schematic', () => {
   it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
-      .toPromise();
+    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');
@@ -62,8 +63,7 @@ describe('Guard Schematic', () => {
   it('should respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
-      .toPromise();
+    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');
@@ -73,15 +73,13 @@ describe('Guard Schematic', () => {
     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 = await schematicRunner.runSchematicAsync('guard', defaultOptions, appTree)
-      .toPromise();
+    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', async () => {
-    const options = { ...defaultOptions, implements: ['CanActivate']};
-    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
-      .toPromise();
+    const options = { ...defaultOptions, implements: ['CanActivate'] };
+    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');
@@ -93,9 +91,8 @@ describe('Guard Schematic', () => {
 
   it('should respect the implements values', async () => {
     const implementationOptions = ['CanActivate', 'CanLoad', 'CanActivateChild'];
-    const options = { ...defaultOptions, implements: implementationOptions};
-    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
-      .toPromise();
+    const options = { ...defaultOptions, implements: implementationOptions };
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree).toPromise();
     const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
 
     // Should contain all implementations
@@ -108,8 +105,7 @@ describe('Guard Schematic', () => {
 
   it('should use CanActivate if no implements value', async () => {
     const options = { ...defaultOptions, implements: undefined };
-    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
-      .toPromise();
+    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');
@@ -118,4 +114,37 @@ describe('Guard Schematic', () => {
     expect(fileString).not.toContain('CanLoad');
     expect(fileString).not.toContain('canLoad');
   });
+
+  it('should add correct imports based on CanLoad implementation', async () => {
+    const implementationOptions = ['CanLoad'];
+    const options = { ...defaultOptions, implements: implementationOptions };
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree).toPromise();
+    const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
+    const expectedImports = `import { CanLoad, Route, UrlSegment, UrlTree } from '@angular/router';`;
+
+    expect(fileString).toContain(expectedImports);
+  });
+
+  it('should add correct imports based on CanActivate implementation', async () => {
+    const implementationOptions = ['CanActivate'];
+    const options = { ...defaultOptions, implements: implementationOptions };
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree).toPromise();
+    const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
+    const expectedImports = `import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot, UrlTree } from '@angular/router';`;
+
+    expect(fileString).toContain(expectedImports);
+  });
+
+  it('should add correct imports if multiple implementations was selected', async () => {
+    const implementationOptions = ['CanActivate', 'CanLoad', 'CanActivateChild'];
+    const options = { ...defaultOptions, implements: implementationOptions };
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree).toPromise();
+    const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
+    const expectedImports =
+      `import ` +
+      `{ ActivatedRouteSnapshot, CanActivate, CanActivateChild, CanLoad, Route, RouterStateSnapshot, UrlSegment, UrlTree } ` +
+      `from '@angular/router';`;
+
+    expect(fileString).toContain(expectedImports);
+  });
 });
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 4f36c07cbd3c..af6837542a4a 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -16,7 +16,7 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new guard.",
+      "description": "Do not create \"spec.ts\" test files for the new guard.",
       "default": false,
       "x-user-analytics": 12
     },
@@ -40,8 +40,7 @@
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the guard.",
+      "description": "Apply lint fixes after generating the guard.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     },
diff --git a/packages/schematics/angular/interceptor/index.ts b/packages/schematics/angular/interceptor/index.ts
index 3aa33e65f589..e796c8f58424 100755
--- a/packages/schematics/angular/interceptor/index.ts
+++ b/packages/schematics/angular/interceptor/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/interceptor/index_spec.ts b/packages/schematics/angular/interceptor/index_spec.ts
index f0eba471aa8d..6fd3c70892df 100755
--- a/packages/schematics/angular/interceptor/index_spec.ts
+++ b/packages/schematics/angular/interceptor/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/interceptor/schema.json b/packages/schematics/angular/interceptor/schema.json
index c37b18b17237..c208192c183f 100755
--- a/packages/schematics/angular/interceptor/schema.json
+++ b/packages/schematics/angular/interceptor/schema.json
@@ -34,14 +34,13 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new interceptor.",
+      "description": "Do not create \"spec.ts\" test files for the new interceptor.",
       "default": false,
       "x-user-analytics": 12
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the interceptor.",
+      "description": "Apply lint fixes after generating the interceptor.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index 7e06cfc17ab7..06cc6cafacfc 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/interface/index_spec.ts b/packages/schematics/angular/interface/index_spec.ts
index eac43cca3cae..45748dc02079 100644
--- a/packages/schematics/angular/interface/index_spec.ts
+++ b/packages/schematics/angular/interface/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index cd6647837b1e..a862d9c55e51 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -42,8 +42,7 @@
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the interface.",
+      "description": "Apply lint fixes after generating the interface.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/library/files/README.md.template b/packages/schematics/angular/library/files/README.md.template
index d30000860412..8545804c5540 100644
--- a/packages/schematics/angular/library/files/README.md.template
+++ b/packages/schematics/angular/library/files/README.md.template
@@ -21,4 +21,4 @@ Run `ng test <%= name %>` to execute the unit tests via [Karma](https://karma-ru
 
 ## 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).
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
diff --git a/packages/schematics/angular/library/files/karma.conf.js.template b/packages/schematics/angular/library/files/karma.conf.js.template
index dc007689baf4..0cefa1c1d13a 100644
--- a/packages/schematics/angular/library/files/karma.conf.js.template
+++ b/packages/schematics/angular/library/files/karma.conf.js.template
@@ -13,15 +13,24 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageReporter: {
       dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= folderName %>'),
       subdir: '.',
       reporters: [
         { type: 'html' },
         { type: 'text-summary' }
-      ],
+      ]
     },
     reporters: ['progress', 'kjhtml'],
     port: 9876,
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 979ef457f561..f2bfd492fdd5 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -1,11 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, parseJson, strings } from '@angular-devkit/core';
+import { join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -22,6 +22,7 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
+import { JSONFile } from '../utility/json-file';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
@@ -30,45 +31,14 @@ import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as LibraryOptions } from './schema';
 
-interface UpdateJsonFn<T> {
-  (obj: T): T | void;
-}
-
-type TsConfigPartialType = {
-  compilerOptions: {
-    baseUrl: string,
-    paths: {
-      [key: string]: string[];
-    },
-  },
-};
-
-function updateJsonFile<T>(host: Tree, path: string, callback: UpdateJsonFn<T>): Tree {
-  const source = host.read(path);
-  if (source) {
-    const sourceText = source.toString('utf-8');
-    const json = parseJson(sourceText, JsonParseMode.Loose);
-    callback(json as {} as T);
-    host.overwrite(path, JSON.stringify(json, null, 2));
-  }
-
-  return host;
-}
-
 function updateTsConfig(packageName: string, ...paths: string[]) {
-
   return (host: Tree) => {
     if (!host.exists('tsconfig.json')) { return host; }
 
-    return updateJsonFile(host, 'tsconfig.json', (tsconfig: TsConfigPartialType) => {
-      if (!tsconfig.compilerOptions.paths) {
-        tsconfig.compilerOptions.paths = {};
-      }
-      if (!tsconfig.compilerOptions.paths[packageName]) {
-        tsconfig.compilerOptions.paths[packageName] = [];
-      }
-      tsconfig.compilerOptions.paths[packageName].push(...paths);
-    });
+    const file = new JSONFile(host, 'tsconfig.json');
+    const jsonPath = ['compilerOptions', 'paths', packageName];
+    const value = file.get(jsonPath);
+    file.modify(jsonPath, Array.isArray(value) ? [...value, ...paths] : paths);
   };
 }
 
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 12ac82cf4c02..be71b40d98f0 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { JsonParseMode, parseJson } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { getFileContent } from '../../angular/utility/test';
 import { Schema as ComponentOptions } from '../component/schema';
 import { latestVersions } from '../utility/latest-versions';
@@ -16,7 +16,7 @@ import { Schema as GenerateLibrarySchema } from './schema';
 
 // tslint:disable-next-line: no-any
 function getJsonFileContent(tree: UnitTestTree, path: string): any {
-  return parseJson(tree.readContent(path).toString(), JsonParseMode.Loose);
+  return parseJson(tree.readContent(path).toString());
 }
 
 describe('Library Schematic', () => {
@@ -149,7 +149,7 @@ describe('Library Schematic', () => {
   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]');
+    expect(fileContent).toMatch(/exports: \[\n(\s*)  FooComponent\n\1\]/);
   });
 
   it('should set the right path and prefix in the tslint file', async () => {
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 354ddf4154a5..468f42d50173 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -31,22 +31,21 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file. "
+      "description": "Do not add dependencies to the \"package.json\" file. "
     },
     "skipInstall": {
-      "description": "When true, does not install dependency packages.",
+      "description": "Do not install dependency packages.",
       "type": "boolean",
       "default": false
     },
     "skipTsConfig": {
       "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."
+      "description": "Do 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.",
+      "description": "Apply lint fixes after generating the library.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 984ce471c889..0710dc776f88 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -116,9 +116,14 @@
       "description": "Add 'declarationMap' compiler options for non production library builds."
     },
     "update-angular-config-v11": {
-      "version": "11.0.0-next.5",
+      "version": "11.0.0-next.8",
       "factory": "./update-11/update-angular-config",
       "description": "Remove deprecated options from 'angular.json' that are no longer present in v11."
+    },
+    "update-workspace-dependencies-v11": {
+      "version": "11.0.0",
+      "factory": "./update-11/update-dependencies",
+      "description": "Update workspace dependencies to match a new v11 project."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint.ts b/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint.ts
index 71e5bafeb136..64364ab80d34 100644
--- a/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint.ts
+++ b/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint_spec.ts b/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint_spec.ts
index f32c800c6c68..f4492d6d9575 100644
--- a/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/add-deprecation-rule-tslint_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/remove-es5-browser-support.ts b/packages/schematics/angular/migrations/update-10/remove-es5-browser-support.ts
index e3c594137657..8a7ab6e09013 100644
--- a/packages/schematics/angular/migrations/update-10/remove-es5-browser-support.ts
+++ b/packages/schematics/angular/migrations/update-10/remove-es5-browser-support.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/remove-es5-browser-support_spec.ts b/packages/schematics/angular/migrations/update-10/remove-es5-browser-support_spec.ts
index 5989b07140d5..34b0dc66ad9a 100644
--- a/packages/schematics/angular/migrations/update-10/remove-es5-browser-support_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/remove-es5-browser-support_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig.ts b/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig.ts
index 69c05a6fe9ee..90ee17ed201e 100644
--- a/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig.ts
+++ b/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig_spec.ts b/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig_spec.ts
index d706c30ddc64..5fecdb92d9f8 100644
--- a/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/remove-solution-style-tsconfig_spec.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
 
 describe('Migration to remove "Solution Style" tsconfig', () => {
@@ -24,8 +24,7 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
 
   // tslint:disable-next-line: no-any
   function readJsonFile(tree: UnitTestTree, filePath: string): any {
-    // tslint:disable-next-line: no-any
-    return parseJson(tree.readContent(filePath).toString(), JsonParseMode.Loose) as any;
+    return parseJson(tree.readContent(filePath).toString());
   }
 
   function createWorkSpaceConfig(tree: UnitTestTree) {
diff --git a/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts b/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts
index e6ef2630927e..6001f8dfd8d5 100644
--- a/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts
+++ b/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/rename-browserslist-config_spec.ts b/packages/schematics/angular/migrations/update-10/rename-browserslist-config_spec.ts
index 7162b1921032..226f426a0fcc 100644
--- a/packages/schematics/angular/migrations/update-10/rename-browserslist-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/rename-browserslist-config_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-angular-config.ts b/packages/schematics/angular/migrations/update-10/update-angular-config.ts
index c64101afdc1c..970ff367e8f6 100644
--- a/packages/schematics/angular/migrations/update-10/update-angular-config.ts
+++ b/packages/schematics/angular/migrations/update-10/update-angular-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-angular-config_spec.ts b/packages/schematics/angular/migrations/update-10/update-angular-config_spec.ts
index 15ca9df73121..61fda51aa245 100644
--- a/packages/schematics/angular/migrations/update-10/update-angular-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/update-angular-config_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-dependencies.ts b/packages/schematics/angular/migrations/update-10/update-dependencies.ts
index 6c0529f694b6..c690ddc42814 100644
--- a/packages/schematics/angular/migrations/update-10/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-10/update-dependencies.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-libraries-tslib.ts b/packages/schematics/angular/migrations/update-10/update-libraries-tslib.ts
index 510fa9e87044..157eefb99cbd 100644
--- a/packages/schematics/angular/migrations/update-10/update-libraries-tslib.ts
+++ b/packages/schematics/angular/migrations/update-10/update-libraries-tslib.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-libraries-tslib_spec.ts b/packages/schematics/angular/migrations/update-10/update-libraries-tslib_spec.ts
index 53dd1bb37ec8..816605c0364d 100644
--- a/packages/schematics/angular/migrations/update-10/update-libraries-tslib_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/update-libraries-tslib_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options.ts b/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options.ts
index 1680dbf50a9b..29e1b2974450 100644
--- a/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options.ts
+++ b/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options_spec.ts b/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options_spec.ts
index 0e4736013256..2c9a2f524875 100644
--- a/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/update-module-and-target-compiler-options_spec.ts
@@ -1,13 +1,13 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
 
 describe('Migration to update target and module compiler options', () => {
@@ -24,8 +24,7 @@ describe('Migration to update target and module compiler options', () => {
 
   // tslint:disable-next-line: no-any
   function readJsonFile(tree: UnitTestTree, filePath: string): any {
-    // tslint:disable-next-line: no-any
-    return parseJson(tree.readContent(filePath).toString(), JsonParseMode.Loose) as any;
+    return parseJson(tree.readContent(filePath).toString());
   }
 
   function createWorkSpaceConfig(tree: UnitTestTree) {
diff --git a/packages/schematics/angular/migrations/update-10/update-tslint.ts b/packages/schematics/angular/migrations/update-10/update-tslint.ts
index 23a77a3e2089..94c4ff0be821 100644
--- a/packages/schematics/angular/migrations/update-10/update-tslint.ts
+++ b/packages/schematics/angular/migrations/update-10/update-tslint.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-10/update-tslint_spec.ts b/packages/schematics/angular/migrations/update-10/update-tslint_spec.ts
index c97aa2533041..fe958843b3c3 100644
--- a/packages/schematics/angular/migrations/update-10/update-tslint_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/update-tslint_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option.ts b/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option.ts
index c922087df8d9..d43c3ad569ed 100644
--- a/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option.ts
+++ b/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option_spec.ts b/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option_spec.ts
index e001f9c43f22..09b1f90a6c30 100644
--- a/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option_spec.ts
+++ b/packages/schematics/angular/migrations/update-11/add-declaration-map-compiler-option_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder.ts b/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder.ts
index 2117252a1b62..5204e46cd4c2 100644
--- a/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder.ts
+++ b/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder_spec.ts b/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder_spec.ts
index fa1560a993a4..6d770b5f780c 100644
--- a/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder_spec.ts
+++ b/packages/schematics/angular/migrations/update-11/replace-ng-packagr-builder_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/update-angular-config.ts b/packages/schematics/angular/migrations/update-11/update-angular-config.ts
index 981edba7136c..99c7c9e19f06 100644
--- a/packages/schematics/angular/migrations/update-11/update-angular-config.ts
+++ b/packages/schematics/angular/migrations/update-11/update-angular-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -17,6 +17,7 @@ export default function (): Rule {
       environment: undefined,
       extractCss: undefined,
       tsconfigFileName: undefined,
+      rebaseRootRelativeCssUrls: undefined,
     };
 
     for (const [, project] of workspace.projects) {
diff --git a/packages/schematics/angular/migrations/update-11/update-angular-config_spec.ts b/packages/schematics/angular/migrations/update-11/update-angular-config_spec.ts
index 8d25c2f90186..9f6ec3f7e675 100644
--- a/packages/schematics/angular/migrations/update-11/update-angular-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-11/update-angular-config_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-11/update-dependencies.ts b/packages/schematics/angular/migrations/update-11/update-dependencies.ts
new file mode 100644
index 000000000000..580f8e7decd4
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-11/update-dependencies.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 default function (): Rule {
+  return (host, context) => {
+    const dependenciesToUpdate: Record<string, string> = {
+      '@types/jasmine': '~3.6.0',
+      'codelyzer': '^6.0.0',
+      'jasmine-core': '~3.6.0',
+      'jasmine-spec-reporter': '~5.0.0',
+      'karma-chrome-launcher': '~3.1.0',
+      'karma-coverage': '~2.0.3',
+      'karma-jasmine': '~4.0.0',
+      'karma-jasmine-html-reporter': '^1.5.0',
+      'tslib': '^2.0.0',
+    };
+
+    let hasChanges = false;
+    for (const [name, version] of Object.entries(dependenciesToUpdate)) {
+      const current = getPackageJsonDependency(host, name);
+      if (!current || current.version === version) {
+        continue;
+      }
+
+      addPackageJsonDependency(host, {
+        type: current.type,
+        name,
+        version,
+        overwrite: true,
+      });
+
+      hasChanges = true;
+    }
+
+    if (hasChanges) {
+      context.addTask(new NodePackageInstallTask());
+    }
+  };
+}
diff --git a/packages/schematics/angular/utility/config.ts b/packages/schematics/angular/migrations/update-6/config.ts
similarity index 93%
rename from packages/schematics/angular/utility/config.ts
rename to packages/schematics/angular/migrations/update-6/config.ts
index 73dede188465..240382d8e00f 100644
--- a/packages/schematics/angular/utility/config.ts
+++ b/packages/schematics/angular/migrations/update-6/config.ts
@@ -1,13 +1,10 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
-import { SchematicsException, Tree } from '@angular-devkit/schematics';
-import { 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
@@ -458,21 +455,3 @@ export interface CliConfig {
       versionMismatch?: boolean;
   };
 }
-
-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/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index 0a7ba545db1c..a0d517bdc46f 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,12 +8,10 @@
 import {
   JsonArray,
   JsonObject,
-  JsonParseMode,
   Path,
   join,
   logging,
   normalize,
-  parseJson,
   tags,
 } from '@angular-devkit/core';
 import {
@@ -24,7 +22,7 @@ import {
   chain,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import { AppConfig, CliConfig } from '../../utility/config';
+import { parse as parseJson } from 'jsonc-parser';
 import {
   NodeDependency,
   NodeDependencyType,
@@ -32,6 +30,7 @@ import {
 } from '../../utility/dependencies';
 import { JSONFile } from '../../utility/json-file';
 import { latestVersions } from '../../utility/latest-versions';
+import { AppConfig, CliConfig } from './config';
 
 const defaults = {
   appRoot: 'src',
@@ -745,7 +744,7 @@ export default function (): Rule {
     if (configBuffer == null) {
       throw new SchematicsException(`Could not find configuration file (${configPath})`);
     }
-    const config = parseJson(configBuffer.toString(), JsonParseMode.Loose);
+    const config = parseJson(configBuffer.toString());
 
     if (typeof config != 'object' || Array.isArray(config) || config === null) {
       throw new SchematicsException('Invalid angular-cli.json configuration; expected an object.');
diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
index bd4d4532da10..fd532ce6e41d 100644
--- a/packages/schematics/angular/migrations/update-6/index_spec.ts
+++ b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
index d52aefce47d3..036fdc6fc6d8 100644
--- a/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
+++ b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index a606dfdc3725..dbcf736d8d24 100644
--- a/packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts
+++ b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index 5359f37ef4ef..bff86c21c2ce 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
index 5195568b7997..d5a0d2142c31 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 bf3c8ae80e55..b4fd9102e160 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-7/typescript-helpers.ts b/packages/schematics/angular/migrations/update-7/typescript-helpers.ts
index 6d0d9e5439be..6c13769cdf1b 100644
--- a/packages/schematics/angular/migrations/update-7/typescript-helpers.ts
+++ b/packages/schematics/angular/migrations/update-7/typescript-helpers.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts b/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts
index 136fa29c4628..aa1b9c06c1eb 100644
--- a/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts
+++ b/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
index a52bb01a8f1e..4ddf63429b69 100644
--- a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 7604ca99dc08..64819ff950e2 100644
--- a/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 4108d9df62b9..2074a3375414 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 874687ff6d38..4042eee5c48f 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 cb337d39980c..accbc18c3b43 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 065387d92ebf..6f1f1444c87b 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -41,7 +41,9 @@ 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 */
+/**
+ * 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. */
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index 6e84be4837d9..ea382a54caed 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 d9279aeff5c2..076277f1b43f 100644
--- a/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
+++ b/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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
index 913cf8de5022..afafdb4324c5 100644
--- a/packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-8/update-dependencies.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
index e10c8707d67c..37658e7f9d83 100644
--- a/packages/schematics/angular/migrations/update-8/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 c2147575b178..345e0e14f12f 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 0a72a836cd75..4211ab50b851 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/add-tslib.ts b/packages/schematics/angular/migrations/update-9/add-tslib.ts
index ca4eca9fa776..49e818b52848 100644
--- a/packages/schematics/angular/migrations/update-9/add-tslib.ts
+++ b/packages/schematics/angular/migrations/update-9/add-tslib.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/index.ts b/packages/schematics/angular/migrations/update-9/index.ts
index 174ec88d9a74..01fa93a35c13 100644
--- a/packages/schematics/angular/migrations/update-9/index.ts
+++ b/packages/schematics/angular/migrations/update-9/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/ivy-libraries.ts b/packages/schematics/angular/migrations/update-9/ivy-libraries.ts
index 1a84d3e25ae3..258cd3e8f169 100644
--- a/packages/schematics/angular/migrations/update-9/ivy-libraries.ts
+++ b/packages/schematics/angular/migrations/update-9/ivy-libraries.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/ivy-libraries_spec.ts b/packages/schematics/angular/migrations/update-9/ivy-libraries_spec.ts
index 5ede412d83ef..bace2acc4d15 100644
--- a/packages/schematics/angular/migrations/update-9/ivy-libraries_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/ivy-libraries_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/ngsw-config.ts b/packages/schematics/angular/migrations/update-9/ngsw-config.ts
index e48120340576..a897d0508bce 100644
--- a/packages/schematics/angular/migrations/update-9/ngsw-config.ts
+++ b/packages/schematics/angular/migrations/update-9/ngsw-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/ngsw-config_spec.ts b/packages/schematics/angular/migrations/update-9/ngsw-config_spec.ts
index b9c10c76cc65..c41f08961807 100644
--- a/packages/schematics/angular/migrations/update-9/ngsw-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/ngsw-config_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/remove-tsickle.ts b/packages/schematics/angular/migrations/update-9/remove-tsickle.ts
index 1f8d4575266d..50d71e6ab62a 100644
--- a/packages/schematics/angular/migrations/update-9/remove-tsickle.ts
+++ b/packages/schematics/angular/migrations/update-9/remove-tsickle.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/remove-tsickle_spec.ts b/packages/schematics/angular/migrations/update-9/remove-tsickle_spec.ts
index 52a1284deaa9..6000b971f3b8 100644
--- a/packages/schematics/angular/migrations/update-9/remove-tsickle_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/remove-tsickle_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/schematic-options.ts b/packages/schematics/angular/migrations/update-9/schematic-options.ts
index 0d96634d4c4f..77a9299863ae 100644
--- a/packages/schematics/angular/migrations/update-9/schematic-options.ts
+++ b/packages/schematics/angular/migrations/update-9/schematic-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/schematic-options_spec.ts b/packages/schematics/angular/migrations/update-9/schematic-options_spec.ts
index 7e9f3c985a10..396efce212fb 100644
--- a/packages/schematics/angular/migrations/update-9/schematic-options_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/schematic-options_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.ts b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.ts
index 25e6763001a5..9676162c9457 100644
--- a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.ts
+++ b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts
index d9fca926bf1f..24566d1c2fc2 100644
--- a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts
@@ -1,19 +1,19 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { getWorkspaceTargets, updateWorkspaceTargets } from './update-workspace-config_spec';
 
 // tslint:disable-next-line: no-any
 function readJsonFile(tree: UnitTestTree, path: string): any {
-  return parseJson(tree.readContent(path).toString(), JsonParseMode.Loose);
+  return parseJson(tree.readContent(path).toString());
 }
 
 function overrideJsonFile(tree: UnitTestTree, path: string, newContent: object) {
diff --git a/packages/schematics/angular/migrations/update-9/update-dependencies.ts b/packages/schematics/angular/migrations/update-9/update-dependencies.ts
index 3a447135f6ec..ad86618243ad 100644
--- a/packages/schematics/angular/migrations/update-9/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-9/update-dependencies.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-i18n.ts b/packages/schematics/angular/migrations/update-9/update-i18n.ts
index 6beb17ebd54d..70110c94b929 100644
--- a/packages/schematics/angular/migrations/update-9/update-i18n.ts
+++ b/packages/schematics/angular/migrations/update-9/update-i18n.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-i18n_spec.ts b/packages/schematics/angular/migrations/update-9/update-i18n_spec.ts
index af3464533fb2..5c0137a52bb0 100644
--- a/packages/schematics/angular/migrations/update-9/update-i18n_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/update-i18n_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-server-main-file.ts b/packages/schematics/angular/migrations/update-9/update-server-main-file.ts
index c015e8502b75..62dac29621f2 100644
--- a/packages/schematics/angular/migrations/update-9/update-server-main-file.ts
+++ b/packages/schematics/angular/migrations/update-9/update-server-main-file.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/update-server-main-file_spec.ts b/packages/schematics/angular/migrations/update-9/update-server-main-file_spec.ts
index 0d2531415299..a77e54b7f837 100644
--- a/packages/schematics/angular/migrations/update-9/update-server-main-file_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/update-server-main-file_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 dc0c4ef01dbe..7a9916860330 100644
--- a/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 9523041460df..26be0046ade6 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/utils.ts b/packages/schematics/angular/migrations/update-9/utils.ts
index 5f339e74d5c2..0c1e2b26c378 100644
--- a/packages/schematics/angular/migrations/update-9/utils.ts
+++ b/packages/schematics/angular/migrations/update-9/utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/migrations/update-9/utils_spec.ts b/packages/schematics/angular/migrations/update-9/utils_spec.ts
index 0726bb04bc8a..30db02307237 100644
--- a/packages/schematics/angular/migrations/update-9/utils_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/utils_spec.ts
@@ -1,7 +1,7 @@
 
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 149c990d417b..63c372de607c 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,6 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';<% if (lazyRoute) { %>
-
+import { RouterModule, Routes } from '@angular/router';<% if (lazyRoute) { %>
 import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';<% } %>
 
 const routes: Routes = [<% if (lazyRoute) { %>{ path: '', component: <%= classify(name) %>Component }<% } %>];
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 6b74fa7d0949..5781d3a7c90c 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index 8cd9f1c62c21..2bf99852df43 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index bf1d762b98a6..7ac2a559aed7 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -29,7 +29,7 @@
     },
     "routing": {
       "type": "boolean",
-      "description": "When true, creates a routing module.",
+      "description": "Create a routing module.",
       "default": false,
       "x-user-analytics": 17
     },
@@ -45,12 +45,12 @@
     },
     "flat": {
       "type": "boolean",
-      "description": "When true, creates the new files at the top level of the current project root. ",
+      "description": "Create the new files at the top level of the current project root. ",
       "default": false
     },
     "commonModule": {
       "type": "boolean",
-      "description": "When true, the new NgModule imports \"CommonModule\". ",
+      "description": "The new NgModule imports \"CommonModule\". ",
       "default": true,
       "visible": false
     },
@@ -61,8 +61,7 @@
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the module.",
+      "description": "Apply lint fixes after generating the module.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 5882311fc085..df8d9888758a 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index f5bb57985542..971cf591972e 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index e772a53571ab..c783672b4761 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -19,18 +19,18 @@
       "x-prompt": "What name would you like to use for the new workspace and initial project?"
     },
     "skipInstall": {
-      "description": "When true, does not install dependency packages.",
+      "description": "Do not install dependency packages.",
       "type": "boolean",
       "default": false
     },
     "linkCli": {
-      "description": "When true, links the CLI to the global version (internal development only).",
+      "description": "Link the CLI to the global version (internal development only).",
       "type": "boolean",
       "default": false,
       "visible": false
     },
     "skipGit": {
-      "description": "When true, does not initialize a git repository.",
+      "description": "Do not initialize a git repository.",
       "type": "boolean",
       "default": false,
       "alias": "g"
@@ -64,22 +64,20 @@
       "default": "projects"
     },
     "inlineStyle": {
-      "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.",
+      "description": "Include styles inline in the component TS file. By default, an external styles file is created and referenced in the component TypeScript file.",
       "type": "boolean",
-      "default": false,
       "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.",
+      "description": "Include template inline in the component TS file. By default, an external template file is created and referenced in the component TypeScript file.",
       "type": "boolean",
-      "default": false,
       "alias": "t",
       "x-user-analytics": 10
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the initial project.",
-      "enum": ["Emulated", "Native", "None", "ShadowDom"],
+      "enum": ["Emulated", "None", "ShadowDom"],
       "type": "string",
       "x-user-analytics": 11
     },
@@ -93,7 +91,7 @@
     },
     "routing": {
       "type": "boolean",
-      "description": "When true, generates a routing module for the initial project.",
+      "description": "Generate a routing module for the initial project.",
       "x-user-analytics": 17
     },
     "prefix": {
@@ -111,25 +109,25 @@
       "x-user-analytics": 5
     },
     "skipTests": {
-      "description": "When true, does not generate \"spec.ts\" test files for the new project. ",
+      "description": "Do not generate \"spec.ts\" test files for the new project.",
       "type": "boolean",
       "default": false,
       "alias": "S",
       "x-user-analytics": 12
     },
     "createApplication": {
-      "description": "When true (the default), creates a new initial application 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.",
+      "description": "Create a new initial application project in the 'src' folder of the new workspace. When false, creates an empty workspace with no initial application. You can then use the generate application command so that all applications are created in the projects folder.",
       "type": "boolean",
       "default": true
     },
     "minimal": {
-      "description": "When true, creates a workspace without any testing frameworks. (Use for learning purposes only.)",
+      "description": "Create a workspace without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false,
       "x-user-analytics": 14
     },
     "strict": {
-      "description": "Creates a workspace with stricter type checking and stricter bundle budgets settings. This setting helps improve maintainability and catch bugs ahead of time. For more information, see https://angular.io/strict",
+      "description": "Creates a workspace with stricter type checking and stricter bundle budgets settings. This setting helps improve maintainability and catch bugs ahead of time. For more information, see https://angular.io/guide/strict-mode",
       "x-prompt": "Do you want to enforce stricter type checking and stricter bundle budgets in the workspace?\n  This setting helps improve maintainability and catch bugs ahead of time.\n  For more information, see https://angular.io/strict",
       "type": "boolean",
       "default": false,
diff --git a/packages/schematics/angular/no_typescript_runtime_dep_spec.js b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
index df1cc2f2332a..2a455952461f 100644
--- a/packages/schematics/angular/no_typescript_runtime_dep_spec.js
+++ b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index eb9f17e65e14..fa634e3887b0 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",
-    "jsonc-parser": "2.3.1"
+    "jsonc-parser": "3.0.0"
   }
 }
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 0e6345076490..29fae68246a8 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index a6178e87885d..586b54b8dd48 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -99,7 +99,7 @@ describe('Pipe Schematic', () => {
 
     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\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*)  FooPipe\n\1\]/);
   });
 
   it('should respect the flat flag', async () => {
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index 3fa6307d311b..a8391f87c7d8 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -34,14 +34,14 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new pipe.",
+      "description": "Do not create \"spec.ts\" test files for the new pipe.",
       "default": false,
       "x-user-analytics": 12
     },
     "skipImport": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not import this pipe into the owning NgModule.",
+      "description": "Do not import this pipe into the owning NgModule.",
       "x-user-analytics": 18
     },
     "module": {
@@ -52,13 +52,13 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this pipe.",
+      "description": "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": "Apply lint fixes after generating the pipe.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
diff --git a/packages/schematics/angular/resolver/index.ts b/packages/schematics/angular/resolver/index.ts
index 73f3282982d3..c70d548b7118 100644
--- a/packages/schematics/angular/resolver/index.ts
+++ b/packages/schematics/angular/resolver/index.ts
@@ -1,10 +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
-*/
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of 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 {
   Rule,
diff --git a/packages/schematics/angular/resolver/index_spec.ts b/packages/schematics/angular/resolver/index_spec.ts
index f7b599cb26e9..f0965987697a 100644
--- a/packages/schematics/angular/resolver/index_spec.ts
+++ b/packages/schematics/angular/resolver/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/resolver/schema.json b/packages/schematics/angular/resolver/schema.json
index feb7c99c956f..d0268aa6ee83 100644
--- a/packages/schematics/angular/resolver/schema.json
+++ b/packages/schematics/angular/resolver/schema.json
@@ -16,7 +16,7 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new resolver.",
+      "description": "Do not create \"spec.ts\" test files for the new resolver.",
       "default": false,
       "x-user-analytics": 12
     },
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 169e789c4476..667c315fd22a 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -1,11 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { join, normalize, tags } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -90,8 +90,14 @@ function updateAppModule(mainPath: string): Rule {
     }
 
     // register SW in app module
-    const importText =
-      `ServiceWorkerModule.register('ngsw-worker.js', { enabled: ${importModule}.production })`;
+    const importText = tags.stripIndent`
+      ServiceWorkerModule.register('ngsw-worker.js', {
+        enabled: ${importModule}.production,
+        // Register the ServiceWorker as soon as the app is stable
+        // or after 30 seconds (whichever comes first).
+        registrationStrategy: 'registerWhenStable:30000'
+      })
+    `;
     moduleSource = getTsSourceFile(host, modulePath);
     const metadataChanges = addSymbolToNgModuleMetadata(
       moduleSource, modulePath, 'imports', importText);
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 501c943eb5a7..064ed6f995fc 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -93,8 +93,13 @@ 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');
-    const expectedText = 'ServiceWorkerModule.register(\'ngsw-worker.js\', { enabled: environment.production })';
-    expect(pkgText).toContain(expectedText);
+    expect(pkgText).toMatch(new RegExp(
+        '(\\s+)ServiceWorkerModule\\.register\\(\'ngsw-worker\\.js\', \\{\\n' +
+        '\\1  enabled: environment\\.production,\\n' +
+        '\\1  // Register the ServiceWorker as soon as the app is stable\\n' +
+        '\\1  // or after 30 seconds \\(whichever comes first\\)\\.\\n' +
+        '\\1  registrationStrategy: \'registerWhenStable:30000\'\\n' +
+        '\\1}\\)'));
   });
 
   it('should add the SW import to the NgModule imports with aliased environment', async () => {
@@ -122,8 +127,13 @@ 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');
-    const expectedText = 'ServiceWorkerModule.register(\'ngsw-worker.js\', { enabled: env.production })';
-    expect(pkgText).toContain(expectedText);
+    expect(pkgText).toMatch(new RegExp(
+        '(\\s+)ServiceWorkerModule\\.register\\(\'ngsw-worker\\.js\', \\{\\n' +
+        '\\1  enabled: env\\.production,\\n' +
+        '\\1  // Register the ServiceWorker as soon as the app is stable\\n' +
+        '\\1  // or after 30 seconds \\(whichever comes first\\)\\.\\n' +
+        '\\1  registrationStrategy: \'registerWhenStable:30000\'\\n' +
+        '\\1}\\)'));
   });
 
   it('should add the SW import to the NgModule imports with existing environment', async () => {
@@ -151,8 +161,13 @@ 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');
-    const expectedText = 'ServiceWorkerModule.register(\'ngsw-worker.js\', { enabled: environment.production })';
-    expect(pkgText).toContain(expectedText);
+    expect(pkgText).toMatch(new RegExp(
+        '(\\s+)ServiceWorkerModule\\.register\\(\'ngsw-worker\\.js\', \\{\\n' +
+        '\\1  enabled: environment\\.production,\\n' +
+        '\\1  // Register the ServiceWorker as soon as the app is stable\\n' +
+        '\\1  // or after 30 seconds \\(whichever comes first\\)\\.\\n' +
+        '\\1  registrationStrategy: \'registerWhenStable:30000\'\\n' +
+        '\\1}\\)'));
   });
 
   it('should put the ngsw-config.json file in the project root', async () => {
diff --git a/packages/schematics/angular/service-worker/schema.d.ts b/packages/schematics/angular/service-worker/schema.d.ts
index 571d59ed771f..c9287f454c00 100644
--- a/packages/schematics/angular/service-worker/schema.d.ts
+++ b/packages/schematics/angular/service-worker/schema.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index c509f05c164f..d51f819823da 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index df7fe66014c4..225fc4e0cf1d 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index 6f5f46de482e..efb08061d6c1 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -34,14 +34,13 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "When true, does not create \"spec.ts\" test files for the new service.",
+      "description": "Do not create \"spec.ts\" test files for the new service.",
       "default": false,
       "x-user-analytics": 12
     },
     "lintFix": {
       "type": "boolean",
-      "default": false,
-      "description": "When true, applies lint fixes after generating the service.",
+      "description": "Apply lint fixes after generating the service.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
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 67e35224b4b9..7c6c6301d218 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 = "4.0";
+    const versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -240,207 +240,212 @@ declare namespace ts {
         DeclareKeyword = 133,
         GetKeyword = 134,
         InferKeyword = 135,
-        IsKeyword = 136,
-        KeyOfKeyword = 137,
-        ModuleKeyword = 138,
-        NamespaceKeyword = 139,
-        NeverKeyword = 140,
-        ReadonlyKeyword = 141,
-        RequireKeyword = 142,
-        NumberKeyword = 143,
-        ObjectKeyword = 144,
-        SetKeyword = 145,
-        StringKeyword = 146,
-        SymbolKeyword = 147,
-        TypeKeyword = 148,
-        UndefinedKeyword = 149,
-        UniqueKeyword = 150,
-        UnknownKeyword = 151,
-        FromKeyword = 152,
-        GlobalKeyword = 153,
-        BigIntKeyword = 154,
-        OfKeyword = 155,
-        QualifiedName = 156,
-        ComputedPropertyName = 157,
-        TypeParameter = 158,
-        Parameter = 159,
-        Decorator = 160,
-        PropertySignature = 161,
-        PropertyDeclaration = 162,
-        MethodSignature = 163,
-        MethodDeclaration = 164,
-        Constructor = 165,
-        GetAccessor = 166,
-        SetAccessor = 167,
-        CallSignature = 168,
-        ConstructSignature = 169,
-        IndexSignature = 170,
-        TypePredicate = 171,
-        TypeReference = 172,
-        FunctionType = 173,
-        ConstructorType = 174,
-        TypeQuery = 175,
-        TypeLiteral = 176,
-        ArrayType = 177,
-        TupleType = 178,
-        OptionalType = 179,
-        RestType = 180,
-        UnionType = 181,
-        IntersectionType = 182,
-        ConditionalType = 183,
-        InferType = 184,
-        ParenthesizedType = 185,
-        ThisType = 186,
-        TypeOperator = 187,
-        IndexedAccessType = 188,
-        MappedType = 189,
-        LiteralType = 190,
-        NamedTupleMember = 191,
-        ImportType = 192,
-        ObjectBindingPattern = 193,
-        ArrayBindingPattern = 194,
-        BindingElement = 195,
-        ArrayLiteralExpression = 196,
-        ObjectLiteralExpression = 197,
-        PropertyAccessExpression = 198,
-        ElementAccessExpression = 199,
-        CallExpression = 200,
-        NewExpression = 201,
-        TaggedTemplateExpression = 202,
-        TypeAssertionExpression = 203,
-        ParenthesizedExpression = 204,
-        FunctionExpression = 205,
-        ArrowFunction = 206,
-        DeleteExpression = 207,
-        TypeOfExpression = 208,
-        VoidExpression = 209,
-        AwaitExpression = 210,
-        PrefixUnaryExpression = 211,
-        PostfixUnaryExpression = 212,
-        BinaryExpression = 213,
-        ConditionalExpression = 214,
-        TemplateExpression = 215,
-        YieldExpression = 216,
-        SpreadElement = 217,
-        ClassExpression = 218,
-        OmittedExpression = 219,
-        ExpressionWithTypeArguments = 220,
-        AsExpression = 221,
-        NonNullExpression = 222,
-        MetaProperty = 223,
-        SyntheticExpression = 224,
-        TemplateSpan = 225,
-        SemicolonClassElement = 226,
-        Block = 227,
-        EmptyStatement = 228,
-        VariableStatement = 229,
-        ExpressionStatement = 230,
-        IfStatement = 231,
-        DoStatement = 232,
-        WhileStatement = 233,
-        ForStatement = 234,
-        ForInStatement = 235,
-        ForOfStatement = 236,
-        ContinueStatement = 237,
-        BreakStatement = 238,
-        ReturnStatement = 239,
-        WithStatement = 240,
-        SwitchStatement = 241,
-        LabeledStatement = 242,
-        ThrowStatement = 243,
-        TryStatement = 244,
-        DebuggerStatement = 245,
-        VariableDeclaration = 246,
-        VariableDeclarationList = 247,
-        FunctionDeclaration = 248,
-        ClassDeclaration = 249,
-        InterfaceDeclaration = 250,
-        TypeAliasDeclaration = 251,
-        EnumDeclaration = 252,
-        ModuleDeclaration = 253,
-        ModuleBlock = 254,
-        CaseBlock = 255,
-        NamespaceExportDeclaration = 256,
-        ImportEqualsDeclaration = 257,
-        ImportDeclaration = 258,
-        ImportClause = 259,
-        NamespaceImport = 260,
-        NamedImports = 261,
-        ImportSpecifier = 262,
-        ExportAssignment = 263,
-        ExportDeclaration = 264,
-        NamedExports = 265,
-        NamespaceExport = 266,
-        ExportSpecifier = 267,
-        MissingDeclaration = 268,
-        ExternalModuleReference = 269,
-        JsxElement = 270,
-        JsxSelfClosingElement = 271,
-        JsxOpeningElement = 272,
-        JsxClosingElement = 273,
-        JsxFragment = 274,
-        JsxOpeningFragment = 275,
-        JsxClosingFragment = 276,
-        JsxAttribute = 277,
-        JsxAttributes = 278,
-        JsxSpreadAttribute = 279,
-        JsxExpression = 280,
-        CaseClause = 281,
-        DefaultClause = 282,
-        HeritageClause = 283,
-        CatchClause = 284,
-        PropertyAssignment = 285,
-        ShorthandPropertyAssignment = 286,
-        SpreadAssignment = 287,
-        EnumMember = 288,
-        UnparsedPrologue = 289,
-        UnparsedPrepend = 290,
-        UnparsedText = 291,
-        UnparsedInternalText = 292,
-        UnparsedSyntheticReference = 293,
-        SourceFile = 294,
-        Bundle = 295,
-        UnparsedSource = 296,
-        InputFiles = 297,
-        JSDocTypeExpression = 298,
-        JSDocAllType = 299,
-        JSDocUnknownType = 300,
-        JSDocNullableType = 301,
-        JSDocNonNullableType = 302,
-        JSDocOptionalType = 303,
-        JSDocFunctionType = 304,
-        JSDocVariadicType = 305,
-        JSDocNamepathType = 306,
-        JSDocComment = 307,
-        JSDocTypeLiteral = 308,
-        JSDocSignature = 309,
-        JSDocTag = 310,
-        JSDocAugmentsTag = 311,
-        JSDocImplementsTag = 312,
-        JSDocAuthorTag = 313,
-        JSDocDeprecatedTag = 314,
-        JSDocClassTag = 315,
-        JSDocPublicTag = 316,
-        JSDocPrivateTag = 317,
-        JSDocProtectedTag = 318,
-        JSDocReadonlyTag = 319,
-        JSDocCallbackTag = 320,
-        JSDocEnumTag = 321,
-        JSDocParameterTag = 322,
-        JSDocReturnTag = 323,
-        JSDocThisTag = 324,
-        JSDocTypeTag = 325,
-        JSDocTemplateTag = 326,
-        JSDocTypedefTag = 327,
-        JSDocPropertyTag = 328,
-        SyntaxList = 329,
-        NotEmittedStatement = 330,
-        PartiallyEmittedExpression = 331,
-        CommaListExpression = 332,
-        MergeDeclarationMarker = 333,
-        EndOfDeclarationMarker = 334,
-        SyntheticReferenceExpression = 335,
-        Count = 336,
+        IntrinsicKeyword = 136,
+        IsKeyword = 137,
+        KeyOfKeyword = 138,
+        ModuleKeyword = 139,
+        NamespaceKeyword = 140,
+        NeverKeyword = 141,
+        ReadonlyKeyword = 142,
+        RequireKeyword = 143,
+        NumberKeyword = 144,
+        ObjectKeyword = 145,
+        SetKeyword = 146,
+        StringKeyword = 147,
+        SymbolKeyword = 148,
+        TypeKeyword = 149,
+        UndefinedKeyword = 150,
+        UniqueKeyword = 151,
+        UnknownKeyword = 152,
+        FromKeyword = 153,
+        GlobalKeyword = 154,
+        BigIntKeyword = 155,
+        OfKeyword = 156,
+        QualifiedName = 157,
+        ComputedPropertyName = 158,
+        TypeParameter = 159,
+        Parameter = 160,
+        Decorator = 161,
+        PropertySignature = 162,
+        PropertyDeclaration = 163,
+        MethodSignature = 164,
+        MethodDeclaration = 165,
+        Constructor = 166,
+        GetAccessor = 167,
+        SetAccessor = 168,
+        CallSignature = 169,
+        ConstructSignature = 170,
+        IndexSignature = 171,
+        TypePredicate = 172,
+        TypeReference = 173,
+        FunctionType = 174,
+        ConstructorType = 175,
+        TypeQuery = 176,
+        TypeLiteral = 177,
+        ArrayType = 178,
+        TupleType = 179,
+        OptionalType = 180,
+        RestType = 181,
+        UnionType = 182,
+        IntersectionType = 183,
+        ConditionalType = 184,
+        InferType = 185,
+        ParenthesizedType = 186,
+        ThisType = 187,
+        TypeOperator = 188,
+        IndexedAccessType = 189,
+        MappedType = 190,
+        LiteralType = 191,
+        NamedTupleMember = 192,
+        TemplateLiteralType = 193,
+        TemplateLiteralTypeSpan = 194,
+        ImportType = 195,
+        ObjectBindingPattern = 196,
+        ArrayBindingPattern = 197,
+        BindingElement = 198,
+        ArrayLiteralExpression = 199,
+        ObjectLiteralExpression = 200,
+        PropertyAccessExpression = 201,
+        ElementAccessExpression = 202,
+        CallExpression = 203,
+        NewExpression = 204,
+        TaggedTemplateExpression = 205,
+        TypeAssertionExpression = 206,
+        ParenthesizedExpression = 207,
+        FunctionExpression = 208,
+        ArrowFunction = 209,
+        DeleteExpression = 210,
+        TypeOfExpression = 211,
+        VoidExpression = 212,
+        AwaitExpression = 213,
+        PrefixUnaryExpression = 214,
+        PostfixUnaryExpression = 215,
+        BinaryExpression = 216,
+        ConditionalExpression = 217,
+        TemplateExpression = 218,
+        YieldExpression = 219,
+        SpreadElement = 220,
+        ClassExpression = 221,
+        OmittedExpression = 222,
+        ExpressionWithTypeArguments = 223,
+        AsExpression = 224,
+        NonNullExpression = 225,
+        MetaProperty = 226,
+        SyntheticExpression = 227,
+        TemplateSpan = 228,
+        SemicolonClassElement = 229,
+        Block = 230,
+        EmptyStatement = 231,
+        VariableStatement = 232,
+        ExpressionStatement = 233,
+        IfStatement = 234,
+        DoStatement = 235,
+        WhileStatement = 236,
+        ForStatement = 237,
+        ForInStatement = 238,
+        ForOfStatement = 239,
+        ContinueStatement = 240,
+        BreakStatement = 241,
+        ReturnStatement = 242,
+        WithStatement = 243,
+        SwitchStatement = 244,
+        LabeledStatement = 245,
+        ThrowStatement = 246,
+        TryStatement = 247,
+        DebuggerStatement = 248,
+        VariableDeclaration = 249,
+        VariableDeclarationList = 250,
+        FunctionDeclaration = 251,
+        ClassDeclaration = 252,
+        InterfaceDeclaration = 253,
+        TypeAliasDeclaration = 254,
+        EnumDeclaration = 255,
+        ModuleDeclaration = 256,
+        ModuleBlock = 257,
+        CaseBlock = 258,
+        NamespaceExportDeclaration = 259,
+        ImportEqualsDeclaration = 260,
+        ImportDeclaration = 261,
+        ImportClause = 262,
+        NamespaceImport = 263,
+        NamedImports = 264,
+        ImportSpecifier = 265,
+        ExportAssignment = 266,
+        ExportDeclaration = 267,
+        NamedExports = 268,
+        NamespaceExport = 269,
+        ExportSpecifier = 270,
+        MissingDeclaration = 271,
+        ExternalModuleReference = 272,
+        JsxElement = 273,
+        JsxSelfClosingElement = 274,
+        JsxOpeningElement = 275,
+        JsxClosingElement = 276,
+        JsxFragment = 277,
+        JsxOpeningFragment = 278,
+        JsxClosingFragment = 279,
+        JsxAttribute = 280,
+        JsxAttributes = 281,
+        JsxSpreadAttribute = 282,
+        JsxExpression = 283,
+        CaseClause = 284,
+        DefaultClause = 285,
+        HeritageClause = 286,
+        CatchClause = 287,
+        PropertyAssignment = 288,
+        ShorthandPropertyAssignment = 289,
+        SpreadAssignment = 290,
+        EnumMember = 291,
+        UnparsedPrologue = 292,
+        UnparsedPrepend = 293,
+        UnparsedText = 294,
+        UnparsedInternalText = 295,
+        UnparsedSyntheticReference = 296,
+        SourceFile = 297,
+        Bundle = 298,
+        UnparsedSource = 299,
+        InputFiles = 300,
+        JSDocTypeExpression = 301,
+        JSDocNameReference = 302,
+        JSDocAllType = 303,
+        JSDocUnknownType = 304,
+        JSDocNullableType = 305,
+        JSDocNonNullableType = 306,
+        JSDocOptionalType = 307,
+        JSDocFunctionType = 308,
+        JSDocVariadicType = 309,
+        JSDocNamepathType = 310,
+        JSDocComment = 311,
+        JSDocTypeLiteral = 312,
+        JSDocSignature = 313,
+        JSDocTag = 314,
+        JSDocAugmentsTag = 315,
+        JSDocImplementsTag = 316,
+        JSDocAuthorTag = 317,
+        JSDocDeprecatedTag = 318,
+        JSDocClassTag = 319,
+        JSDocPublicTag = 320,
+        JSDocPrivateTag = 321,
+        JSDocProtectedTag = 322,
+        JSDocReadonlyTag = 323,
+        JSDocCallbackTag = 324,
+        JSDocEnumTag = 325,
+        JSDocParameterTag = 326,
+        JSDocReturnTag = 327,
+        JSDocThisTag = 328,
+        JSDocTypeTag = 329,
+        JSDocTemplateTag = 330,
+        JSDocTypedefTag = 331,
+        JSDocSeeTag = 332,
+        JSDocPropertyTag = 333,
+        SyntaxList = 334,
+        NotEmittedStatement = 335,
+        PartiallyEmittedExpression = 336,
+        CommaListExpression = 337,
+        MergeDeclarationMarker = 338,
+        EndOfDeclarationMarker = 339,
+        SyntheticReferenceExpression = 340,
+        Count = 341,
         FirstAssignment = 62,
         LastAssignment = 77,
         FirstCompoundAssignment = 63,
@@ -448,15 +453,15 @@ declare namespace ts {
         FirstReservedWord = 80,
         LastReservedWord = 115,
         FirstKeyword = 80,
-        LastKeyword = 155,
+        LastKeyword = 156,
         FirstFutureReservedWord = 116,
         LastFutureReservedWord = 124,
-        FirstTypeNode = 171,
-        LastTypeNode = 192,
+        FirstTypeNode = 172,
+        LastTypeNode = 195,
         FirstPunctuation = 18,
         LastPunctuation = 77,
         FirstToken = 0,
-        LastToken = 155,
+        LastToken = 156,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -465,21 +470,21 @@ declare namespace ts {
         LastTemplateToken = 17,
         FirstBinaryOperator = 29,
         LastBinaryOperator = 77,
-        FirstStatement = 229,
-        LastStatement = 245,
-        FirstNode = 156,
-        FirstJSDocNode = 298,
-        LastJSDocNode = 328,
-        FirstJSDocTagNode = 310,
-        LastJSDocTagNode = 328,
+        FirstStatement = 232,
+        LastStatement = 248,
+        FirstNode = 157,
+        FirstJSDocNode = 301,
+        LastJSDocNode = 333,
+        FirstJSDocTagNode = 314,
+        LastJSDocTagNode = 333,
     }
     export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia;
     export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral;
     export type PseudoLiteralSyntaxKind = SyntaxKind.TemplateHead | SyntaxKind.TemplateMiddle | SyntaxKind.TemplateTail;
     export type PunctuationSyntaxKind = SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.OpenParenToken | SyntaxKind.CloseParenToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.DotToken | SyntaxKind.DotDotDotToken | SyntaxKind.SemicolonToken | SyntaxKind.CommaToken | SyntaxKind.QuestionDotToken | SyntaxKind.LessThanToken | SyntaxKind.LessThanSlashToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.EqualsGreaterThanToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.AsteriskAsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken | SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken | SyntaxKind.ExclamationToken | SyntaxKind.TildeToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionQuestionToken | SyntaxKind.QuestionToken | SyntaxKind.ColonToken | SyntaxKind.AtToken | SyntaxKind.BacktickToken | SyntaxKind.EqualsToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken;
-    export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.AssertsKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.ContinueKeyword | 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.GlobalKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InferKeyword | SyntaxKind.InKeyword | 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.OfKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | 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;
+    export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.AssertsKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.ContinueKeyword | 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.GlobalKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InferKeyword | SyntaxKind.InKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IntrinsicKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.OfKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | 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;
     export type ModifierSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.ConstKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.ExportKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.StaticKeyword;
-    export type KeywordTypeSyntaxKind = SyntaxKind.AnyKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VoidKeyword;
+    export type KeywordTypeSyntaxKind = SyntaxKind.AnyKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.IntrinsicKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VoidKeyword;
     export type TokenSyntaxKind = SyntaxKind.Unknown | SyntaxKind.EndOfFileToken | TriviaSyntaxKind | LiteralSyntaxKind | PseudoLiteralSyntaxKind | PunctuationSyntaxKind | SyntaxKind.Identifier | KeywordSyntaxKind;
     export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
     export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
@@ -610,7 +615,8 @@ declare namespace ts {
         None = 0,
         ReservedInNestedScopes = 8,
         Optimistic = 16,
-        FileLevel = 32
+        FileLevel = 32,
+        AllowNameSubstitution = 64
     }
     export interface Identifier extends PrimaryExpression, Declaration {
         readonly kind: SyntaxKind.Identifier;
@@ -942,6 +948,7 @@ declare namespace ts {
         readonly kind: SyntaxKind.MappedType;
         readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
+        readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
         readonly type?: TypeNode;
     }
@@ -954,6 +961,17 @@ declare namespace ts {
     }
     export type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
     export type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral;
+    export interface TemplateLiteralTypeNode extends TypeNode {
+        kind: SyntaxKind.TemplateLiteralType;
+        readonly head: TemplateHead;
+        readonly templateSpans: NodeArray<TemplateLiteralTypeSpan>;
+    }
+    export interface TemplateLiteralTypeSpan extends TypeNode {
+        readonly kind: SyntaxKind.TemplateLiteralTypeSpan;
+        readonly parent: TemplateLiteralTypeNode;
+        readonly type: TypeNode;
+        readonly literal: TemplateMiddle | TemplateTail;
+    }
     export interface Expression extends Node {
         _expressionBrand: any;
     }
@@ -1142,15 +1160,15 @@ declare namespace ts {
     export type LiteralToken = NumericLiteral | BigIntLiteral | StringLiteral | JsxText | RegularExpressionLiteral | NoSubstitutionTemplateLiteral;
     export interface TemplateHead extends TemplateLiteralLikeNode {
         readonly kind: SyntaxKind.TemplateHead;
-        readonly parent: TemplateExpression;
+        readonly parent: TemplateExpression | TemplateLiteralTypeNode;
     }
     export interface TemplateMiddle extends TemplateLiteralLikeNode {
         readonly kind: SyntaxKind.TemplateMiddle;
-        readonly parent: TemplateSpan;
+        readonly parent: TemplateSpan | TemplateLiteralTypeSpan;
     }
     export interface TemplateTail extends TemplateLiteralLikeNode {
         readonly kind: SyntaxKind.TemplateTail;
-        readonly parent: TemplateSpan;
+        readonly parent: TemplateSpan | TemplateLiteralTypeSpan;
     }
     export type PseudoLiteralToken = TemplateHead | TemplateMiddle | TemplateTail;
     export type TemplateLiteralToken = NoSubstitutionTemplateLiteral | PseudoLiteralToken;
@@ -1682,6 +1700,10 @@ declare namespace ts {
         readonly kind: SyntaxKind.JSDocTypeExpression;
         readonly type: TypeNode;
     }
+    export interface JSDocNameReference extends Node {
+        readonly kind: SyntaxKind.JSDocNameReference;
+        readonly name: EntityName;
+    }
     export interface JSDocType extends TypeNode {
         _jsDocTypeBrand: any;
     }
@@ -1780,6 +1802,10 @@ declare namespace ts {
         readonly constraint: JSDocTypeExpression | undefined;
         readonly typeParameters: NodeArray<TypeParameterDeclaration>;
     }
+    export interface JSDocSeeTag extends JSDocTag {
+        readonly kind: SyntaxKind.JSDocSeeTag;
+        readonly name?: JSDocNameReference;
+    }
     export interface JSDocReturnTag extends JSDocTag {
         readonly kind: SyntaxKind.JSDocReturnTag;
         readonly typeExpression?: JSDocTypeExpression;
@@ -2053,6 +2079,7 @@ declare namespace ts {
          * Gets a type checker that can be used to semantically analyze source files in the program.
          */
         getTypeChecker(): TypeChecker;
+        getTypeCatalog(): readonly Type[];
         getNodeCount(): number;
         getIdentifierCount(): number;
         getSymbolCount(): number;
@@ -2159,7 +2186,7 @@ declare namespace ts {
          * 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;
+        getExportSpecifierLocalTargetSymbol(location: ExportSpecifier | Identifier): Symbol | undefined;
         /**
          * If a symbol is a local symbol with an associated exported symbol, returns the exported symbol.
          * Otherwise returns its input.
@@ -2180,6 +2207,7 @@ declare namespace ts {
         getFullyQualifiedName(symbol: Symbol): string;
         getAugmentedPropertiesOfType(type: Type): Symbol[];
         getRootSymbols(symbol: Symbol): readonly Symbol[];
+        getSymbolOfExpando(node: Node, allowDeclaration: boolean): Symbol | undefined;
         getContextualType(node: Expression): Type | undefined;
         /**
          * returns unknownSignature in the case of an error.
@@ -2450,11 +2478,13 @@ declare namespace ts {
         Conditional = 16777216,
         Substitution = 33554432,
         NonPrimitive = 67108864,
+        TemplateLiteral = 134217728,
+        StringMapping = 268435456,
         Literal = 2944,
         Unit = 109440,
         StringOrNumberLiteral = 384,
         PossiblyFalsy = 117724,
-        StringLike = 132,
+        StringLike = 402653316,
         NumberLike = 296,
         BigIntLike = 2112,
         BooleanLike = 528,
@@ -2465,10 +2495,10 @@ declare namespace ts {
         StructuredType = 3670016,
         TypeVariable = 8650752,
         InstantiableNonPrimitive = 58982400,
-        InstantiablePrimitive = 4194304,
-        Instantiable = 63176704,
-        StructuredOrInstantiable = 66846720,
-        Narrowable = 133970943,
+        InstantiablePrimitive = 406847488,
+        Instantiable = 465829888,
+        StructuredOrInstantiable = 469499904,
+        Narrowable = 536624127,
     }
     export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     export interface Type {
@@ -2605,8 +2635,6 @@ declare namespace ts {
         node: ConditionalTypeNode;
         checkType: Type;
         extendsType: Type;
-        trueType: Type;
-        falseType: Type;
         isDistributive: boolean;
         inferTypeParameters?: TypeParameter[];
         outerTypeParameters?: TypeParameter[];
@@ -2621,6 +2649,14 @@ declare namespace ts {
         resolvedTrueType: Type;
         resolvedFalseType: Type;
     }
+    export interface TemplateLiteralType extends InstantiableType {
+        texts: readonly string[];
+        types: readonly Type[];
+    }
+    export interface StringMappingType extends InstantiableType {
+        symbol: Symbol;
+        type: Type;
+    }
     export interface SubstitutionType extends InstantiableType {
         baseType: Type;
         substitute: Type;
@@ -2798,6 +2834,7 @@ declare namespace ts {
         assumeChangesOnlyAffectDirectDependencies?: boolean;
         noLib?: boolean;
         noResolve?: boolean;
+        noUncheckedIndexedAccess?: boolean;
         out?: string;
         outDir?: string;
         outFile?: string;
@@ -2808,6 +2845,7 @@ declare namespace ts {
         reactNamespace?: string;
         jsxFactory?: string;
         jsxFragmentFactory?: string;
+        jsxImportSource?: string;
         composite?: boolean;
         incremental?: boolean;
         tsBuildInfoFile?: string;
@@ -2852,7 +2890,8 @@ declare namespace ts {
         enable?: boolean;
         include?: string[];
         exclude?: string[];
-        [option: string]: string[] | boolean | undefined;
+        disableFilenameBasedTypeAcquisition?: boolean;
+        [option: string]: CompilerOptionsValue | undefined;
     }
     export enum ModuleKind {
         None = 0,
@@ -2868,7 +2907,9 @@ declare namespace ts {
         None = 0,
         Preserve = 1,
         React = 2,
-        ReactNative = 3
+        ReactNative = 3,
+        ReactJSX = 4,
+        ReactJSXDev = 5
     }
     export enum ImportsNotUsedAsValues {
         Remove = 0,
@@ -3178,6 +3219,8 @@ declare namespace ts {
         updateConstructSignature(node: ConstructSignatureDeclaration, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined): ConstructSignatureDeclaration;
         createIndexSignature(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration;
         updateIndexSignature(node: IndexSignatureDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration;
+        createTemplateLiteralTypeSpan(type: TypeNode, literal: TemplateMiddle | TemplateTail): TemplateLiteralTypeSpan;
+        updateTemplateLiteralTypeSpan(node: TemplateLiteralTypeSpan, type: TypeNode, literal: TemplateMiddle | TemplateTail): TemplateLiteralTypeSpan;
         createKeywordTypeNode<TKind extends KeywordTypeSyntaxKind>(kind: TKind): KeywordTypeNode<TKind>;
         createTypePredicateNode(assertsModifier: AssertsKeyword | undefined, parameterName: Identifier | ThisTypeNode | string, type: TypeNode | undefined): TypePredicateNode;
         updateTypePredicateNode(node: TypePredicateNode, assertsModifier: AssertsKeyword | undefined, parameterName: Identifier | ThisTypeNode, type: TypeNode | undefined): TypePredicateNode;
@@ -3218,10 +3261,12 @@ declare namespace ts {
         updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode;
         createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
         updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
-        createMappedTypeNode(readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
-        updateMappedTypeNode(node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
+        createMappedTypeNode(readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, nameType: TypeNode | undefined, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
+        updateMappedTypeNode(node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, nameType: TypeNode | undefined, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
         createLiteralTypeNode(literal: LiteralTypeNode["literal"]): LiteralTypeNode;
         updateLiteralTypeNode(node: LiteralTypeNode, literal: LiteralTypeNode["literal"]): LiteralTypeNode;
+        createTemplateLiteralType(head: TemplateHead, templateSpans: readonly TemplateLiteralTypeSpan[]): TemplateLiteralTypeNode;
+        updateTemplateLiteralType(node: TemplateLiteralTypeNode, head: TemplateHead, templateSpans: readonly TemplateLiteralTypeSpan[]): TemplateLiteralTypeNode;
         createObjectBindingPattern(elements: readonly BindingElement[]): ObjectBindingPattern;
         updateObjectBindingPattern(node: ObjectBindingPattern, elements: readonly BindingElement[]): ObjectBindingPattern;
         createArrayBindingPattern(elements: readonly ArrayBindingElement[]): ArrayBindingPattern;
@@ -3401,6 +3446,8 @@ declare namespace ts {
         updateJSDocNamepathType(node: JSDocNamepathType, type: TypeNode): JSDocNamepathType;
         createJSDocTypeExpression(type: TypeNode): JSDocTypeExpression;
         updateJSDocTypeExpression(node: JSDocTypeExpression, type: TypeNode): JSDocTypeExpression;
+        createJSDocNameReference(name: EntityName): JSDocNameReference;
+        updateJSDocNameReference(node: JSDocNameReference, name: EntityName): JSDocNameReference;
         createJSDocTypeLiteral(jsDocPropertyTags?: readonly JSDocPropertyLikeTag[], isArrayType?: boolean): JSDocTypeLiteral;
         updateJSDocTypeLiteral(node: JSDocTypeLiteral, jsDocPropertyTags: readonly JSDocPropertyLikeTag[] | undefined, isArrayType: boolean | undefined): JSDocTypeLiteral;
         createJSDocSignature(typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type?: JSDocReturnTag): JSDocSignature;
@@ -3415,6 +3462,8 @@ declare namespace ts {
         updateJSDocPropertyTag(node: JSDocPropertyTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | undefined): JSDocPropertyTag;
         createJSDocTypeTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocTypeTag;
         updateJSDocTypeTag(node: JSDocTypeTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | undefined): JSDocTypeTag;
+        createJSDocSeeTag(tagName: Identifier | undefined, nameExpression: JSDocNameReference | undefined, comment?: string): JSDocSeeTag;
+        updateJSDocSeeTag(node: JSDocSeeTag, tagName: Identifier | undefined, nameExpression: JSDocNameReference | undefined, comment?: string): JSDocSeeTag;
         createJSDocReturnTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression, comment?: string): JSDocReturnTag;
         updateJSDocReturnTag(node: JSDocReturnTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | undefined): JSDocReturnTag;
         createJSDocThisTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocThisTag;
@@ -4002,6 +4051,14 @@ declare namespace ts {
     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;
+    /**
+     * Iterates through the parent chain of a node and performs the callback on each parent until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, it applies the callback until the parent pointer is undefined or the callback returns "quit"
+     * At that point findAncestor returns undefined.
+     */
+    function findAncestor<T extends Node>(node: Node | undefined, callback: (element: Node) => element is T): T | undefined;
+    function findAncestor(node: Node | undefined, callback: (element: Node) => boolean | "quit"): Node | undefined;
     /**
      * Gets a value indicating whether a node originated in the parse tree.
      *
@@ -4320,6 +4377,8 @@ declare namespace ts {
     function isMappedTypeNode(node: Node): node is MappedTypeNode;
     function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
     function isImportTypeNode(node: Node): node is ImportTypeNode;
+    function isTemplateLiteralTypeSpan(node: Node): node is TemplateLiteralTypeSpan;
+    function isTemplateLiteralTypeNode(node: Node): node is TemplateLiteralTypeNode;
     function isObjectBindingPattern(node: Node): node is ObjectBindingPattern;
     function isArrayBindingPattern(node: Node): node is ArrayBindingPattern;
     function isBindingElement(node: Node): node is BindingElement;
@@ -4424,6 +4483,7 @@ declare namespace ts {
     function isBundle(node: Node): node is Bundle;
     function isUnparsedSource(node: Node): node is UnparsedSource;
     function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression;
+    function isJSDocNameReference(node: Node): node is JSDocNameReference;
     function isJSDocAllType(node: Node): node is JSDocAllType;
     function isJSDocUnknownType(node: Node): node is JSDocUnknownType;
     function isJSDocNullableType(node: Node): node is JSDocNullableType;
@@ -5357,6 +5417,10 @@ declare namespace ts {
     type WithMetadata<T> = T & {
         metadata?: unknown;
     };
+    enum SemanticClassificationFormat {
+        Original = "original",
+        TwentyTwenty = "2020"
+    }
     interface LanguageService {
         /** This is used as a part of restarting the language service. */
         cleanupSemanticCache(): void;
@@ -5408,10 +5472,22 @@ declare namespace ts {
         getCompilerOptionsDiagnostics(): Diagnostic[];
         /** @deprecated Use getEncodedSyntacticClassifications instead. */
         getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+        getSyntacticClassifications(fileName: string, span: TextSpan, format: SemanticClassificationFormat): ClassifiedSpan[] | ClassifiedSpan2020[];
         /** @deprecated Use getEncodedSemanticClassifications instead. */
         getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+        getSemanticClassifications(fileName: string, span: TextSpan, format: SemanticClassificationFormat): ClassifiedSpan[] | ClassifiedSpan2020[];
+        /** Encoded as triples of [start, length, ClassificationType]. */
         getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
-        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
+        /**
+         * Gets semantic highlights information for a particular file. Has two formats, an older
+         * version used by VS and a format used by VS Code.
+         *
+         * @param fileName The path to the file
+         * @param position A text span to return results within
+         * @param format Which format to use, defaults to "original"
+         * @returns a number array encoded as triples of [start, length, ClassificationType, ...].
+         */
+        getEncodedSemanticClassifications(fileName: string, span: TextSpan, format?: SemanticClassificationFormat): Classifications;
         /**
          * Gets completion entries at a particular position in a file.
          *
@@ -5570,6 +5646,10 @@ declare namespace ts {
         textSpan: TextSpan;
         classificationType: ClassificationTypeNames;
     }
+    interface ClassifiedSpan2020 {
+        textSpan: TextSpan;
+        classificationType: number;
+    }
     /**
      * Navigation bar interface designed for visual studio's dual-column layout.
      * This does not form a proper tree.
@@ -5966,6 +6046,12 @@ declare namespace ts {
         /** Not true for all global completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
         isGlobalCompletion: boolean;
         isMemberCompletion: boolean;
+        /**
+         * In the absence of `CompletionEntry["replacementSpan"], the editor may choose whether to use
+         * this span or its default one. If `CompletionEntry["replacementSpan"]` is defined, that span
+         * must be used to commit that completion entry.
+         */
+        optionalReplacementSpan?: TextSpan;
         /**
          * true when the current location also allows for a new identifier
          */
@@ -6509,9 +6595,9 @@ declare namespace ts {
     /** @deprecated Use `factory.updateIndexedAccessTypeNode` or the factory supplied by your transformation context instead. */
     const updateIndexedAccessTypeNode: (node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode) => IndexedAccessTypeNode;
     /** @deprecated Use `factory.createMappedTypeNode` or the factory supplied by your transformation context instead. */
-    const createMappedTypeNode: (readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode;
+    const createMappedTypeNode: (readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, nameType: TypeNode | undefined, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode;
     /** @deprecated Use `factory.updateMappedTypeNode` or the factory supplied by your transformation context instead. */
-    const updateMappedTypeNode: (node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode;
+    const updateMappedTypeNode: (node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, nameType: TypeNode | undefined, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode;
     /** @deprecated Use `factory.createLiteralTypeNode` or the factory supplied by your transformation context instead. */
     const createLiteralTypeNode: (literal: LiteralExpression | TrueLiteral | FalseLiteral | PrefixUnaryExpression | NullLiteral) => LiteralTypeNode;
     /** @deprecated Use `factory.updateLiteralTypeNode` or the factory supplied by your transformation context instead. */
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 70d7dd8323d4..a3c7e072007b 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
@@ -286,9 +286,9 @@ var ts;
 (function (ts) {
     // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configurePrerelease` too.
-    ts.versionMajorMinor = "4.0";
+    ts.versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
-    ts.version = "4.0.2";
+    ts.version = "4.1.2";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -1381,7 +1381,7 @@ var ts;
         var high = array.length - 1;
         while (low <= high) {
             var middle = low + ((high - low) >> 1);
-            var midKey = keySelector(array[middle]);
+            var midKey = keySelector(array[middle], middle);
             switch (keyComparer(midKey, key)) {
                 case -1 /* LessThan */:
                     low = middle + 1;
@@ -1476,15 +1476,14 @@ var ts;
         return values;
     }
     ts.getOwnValues = getOwnValues;
-    var _entries = Object.entries ? Object.entries : function (obj) {
+    var _entries = Object.entries || (function (obj) {
         var keys = getOwnKeys(obj);
         var result = Array(keys.length);
-        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-            var key = keys_1[_i];
-            result.push([key, obj[key]]);
+        for (var i = 0; i < keys.length; i++) {
+            result[i] = [keys[i], obj[keys[i]]];
         }
         return result;
-    };
+    });
     function getEntries(obj) {
         return obj ? _entries(obj) : [];
     }
@@ -2356,20 +2355,39 @@ var ts;
             }
         }
     }
-    function padLeft(s, length) {
-        while (s.length < length) {
-            s = " " + s;
-        }
-        return s;
+    /**
+     * Returns string left-padded with spaces or zeros until it reaches the given length.
+     *
+     * @param s String to pad.
+     * @param length Final padded length. If less than or equal to 's.length', returns 's' unchanged.
+     * @param padString Character to use as padding (default " ").
+     */
+    function padLeft(s, length, padString) {
+        if (padString === void 0) { padString = " "; }
+        return length <= s.length ? s : padString.repeat(length - s.length) + s;
     }
     ts.padLeft = padLeft;
-    function padRight(s, length) {
-        while (s.length < length) {
-            s = s + " ";
-        }
-        return s;
+    /**
+     * Returns string right-padded with spaces until it reaches the given length.
+     *
+     * @param s String to pad.
+     * @param length Final padded length. If less than or equal to 's.length', returns 's' unchanged.
+     * @param padString Character to use as padding (default " ").
+     */
+    function padRight(s, length, padString) {
+        if (padString === void 0) { padString = " "; }
+        return length <= s.length ? s : s + padString.repeat(length - s.length);
     }
     ts.padRight = padRight;
+    function takeWhile(array, predicate) {
+        var len = array.length;
+        var index = 0;
+        while (index < len && predicate(array[index])) {
+            index++;
+        }
+        return array.slice(0, index);
+    }
+    ts.takeWhile = takeWhile;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -2684,6 +2702,10 @@ var ts;
             return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
         }
         Debug.formatObjectFlags = formatObjectFlags;
+        function formatFlowFlags(flags) {
+            return formatEnum(flags, ts.FlowFlags, /*isFlags*/ true);
+        }
+        Debug.formatFlowFlags = formatFlowFlags;
         var isDebugInfoEnabled = false;
         var extendedDebugModule;
         function extendedDebug() {
@@ -2701,31 +2723,167 @@ var ts;
             return extendedDebug().formatControlFlowGraph(flowNode);
         }
         Debug.formatControlFlowGraph = formatControlFlowGraph;
+        var flowNodeProto;
+        function attachFlowNodeDebugInfoWorker(flowNode) {
+            if (!("__debugFlowFlags" in flowNode)) { // eslint-disable-line no-in-operator
+                Object.defineProperties(flowNode, {
+                    // for use with vscode-js-debug's new customDescriptionGenerator in launch.json
+                    __tsDebuggerDisplay: {
+                        value: function () {
+                            var flowHeader = this.flags & 2 /* Start */ ? "FlowStart" :
+                                this.flags & 4 /* BranchLabel */ ? "FlowBranchLabel" :
+                                    this.flags & 8 /* LoopLabel */ ? "FlowLoopLabel" :
+                                        this.flags & 16 /* Assignment */ ? "FlowAssignment" :
+                                            this.flags & 32 /* TrueCondition */ ? "FlowTrueCondition" :
+                                                this.flags & 64 /* FalseCondition */ ? "FlowFalseCondition" :
+                                                    this.flags & 128 /* SwitchClause */ ? "FlowSwitchClause" :
+                                                        this.flags & 256 /* ArrayMutation */ ? "FlowArrayMutation" :
+                                                            this.flags & 512 /* Call */ ? "FlowCall" :
+                                                                this.flags & 1024 /* ReduceLabel */ ? "FlowReduceLabel" :
+                                                                    this.flags & 1 /* Unreachable */ ? "FlowUnreachable" :
+                                                                        "UnknownFlow";
+                            var remainingFlags = this.flags & ~(2048 /* Referenced */ - 1);
+                            return "" + flowHeader + (remainingFlags ? " (" + formatFlowFlags(remainingFlags) + ")" : "");
+                        }
+                    },
+                    __debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, /*isFlags*/ true); } },
+                    __debugToString: { value: function () { return formatControlFlowGraph(this); } }
+                });
+            }
+        }
         function attachFlowNodeDebugInfo(flowNode) {
             if (isDebugInfoEnabled) {
-                if (!("__debugFlowFlags" in flowNode)) { // eslint-disable-line no-in-operator
-                    Object.defineProperties(flowNode, {
-                        __debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, /*isFlags*/ true); } },
-                        __debugToString: { value: function () { return formatControlFlowGraph(this); } }
-                    });
+                if (typeof Object.setPrototypeOf === "function") {
+                    // if we're in es2015, attach the method to a shared prototype for `FlowNode`
+                    // so the method doesn't show up in the watch window.
+                    if (!flowNodeProto) {
+                        flowNodeProto = Object.create(Object.prototype);
+                        attachFlowNodeDebugInfoWorker(flowNodeProto);
+                    }
+                    Object.setPrototypeOf(flowNode, flowNodeProto);
+                }
+                else {
+                    // not running in an es2015 environment, attach the method directly.
+                    attachFlowNodeDebugInfoWorker(flowNode);
                 }
             }
         }
         Debug.attachFlowNodeDebugInfo = attachFlowNodeDebugInfo;
+        var nodeArrayProto;
+        function attachNodeArrayDebugInfoWorker(array) {
+            if (!("__tsDebuggerDisplay" in array)) { // eslint-disable-line no-in-operator
+                Object.defineProperties(array, {
+                    __tsDebuggerDisplay: {
+                        value: function (defaultValue) {
+                            // An `Array` with extra properties is rendered as `[A, B, prop1: 1, prop2: 2]`. Most of
+                            // these aren't immediately useful so we trim off the `prop1: ..., prop2: ...` part from the
+                            // formatted string.
+                            defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
+                            return "NodeArray " + defaultValue;
+                        }
+                    }
+                });
+            }
+        }
+        function attachNodeArrayDebugInfo(array) {
+            if (isDebugInfoEnabled) {
+                if (typeof Object.setPrototypeOf === "function") {
+                    // if we're in es2015, attach the method to a shared prototype for `NodeArray`
+                    // so the method doesn't show up in the watch window.
+                    if (!nodeArrayProto) {
+                        nodeArrayProto = Object.create(Array.prototype);
+                        attachNodeArrayDebugInfoWorker(nodeArrayProto);
+                    }
+                    Object.setPrototypeOf(array, nodeArrayProto);
+                }
+                else {
+                    // not running in an es2015 environment, attach the method directly.
+                    attachNodeArrayDebugInfoWorker(array);
+                }
+            }
+        }
+        Debug.attachNodeArrayDebugInfo = attachNodeArrayDebugInfo;
         /**
          * Injects debug information into frequently used types.
          */
         function enableDebugInfo() {
             if (isDebugInfoEnabled)
                 return;
+            // avoid recomputing
+            var weakTypeTextMap;
+            var weakNodeTextMap;
+            function getWeakTypeTextMap() {
+                if (weakTypeTextMap === undefined) {
+                    if (typeof WeakMap === "function")
+                        weakTypeTextMap = new WeakMap();
+                }
+                return weakTypeTextMap;
+            }
+            function getWeakNodeTextMap() {
+                if (weakNodeTextMap === undefined) {
+                    if (typeof WeakMap === "function")
+                        weakNodeTextMap = new WeakMap();
+                }
+                return weakNodeTextMap;
+            }
             // Add additional properties in debug mode to assist with debugging.
             Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                // for use with vscode-js-debug's new customDescriptionGenerator in launch.json
+                __tsDebuggerDisplay: {
+                    value: function () {
+                        var symbolHeader = this.flags & 33554432 /* Transient */ ? "TransientSymbol" :
+                            "Symbol";
+                        var remainingSymbolFlags = this.flags & ~33554432 /* Transient */;
+                        return symbolHeader + " '" + ts.symbolName(this) + "'" + (remainingSymbolFlags ? " (" + formatSymbolFlags(remainingSymbolFlags) + ")" : "");
+                    }
+                },
                 __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
             });
             Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                // for use with vscode-js-debug's new customDescriptionGenerator in launch.json
+                __tsDebuggerDisplay: {
+                    value: function () {
+                        var typeHeader = this.flags & 98304 /* Nullable */ ? "NullableType" :
+                            this.flags & 384 /* StringOrNumberLiteral */ ? "LiteralType " + JSON.stringify(this.value) :
+                                this.flags & 2048 /* BigIntLiteral */ ? "LiteralType " + (this.value.negative ? "-" : "") + this.value.base10Value + "n" :
+                                    this.flags & 8192 /* UniqueESSymbol */ ? "UniqueESSymbolType" :
+                                        this.flags & 32 /* Enum */ ? "EnumType" :
+                                            this.flags & 67359327 /* Intrinsic */ ? "IntrinsicType " + this.intrinsicName :
+                                                this.flags & 1048576 /* Union */ ? "UnionType" :
+                                                    this.flags & 2097152 /* Intersection */ ? "IntersectionType" :
+                                                        this.flags & 4194304 /* Index */ ? "IndexType" :
+                                                            this.flags & 8388608 /* IndexedAccess */ ? "IndexedAccessType" :
+                                                                this.flags & 16777216 /* Conditional */ ? "ConditionalType" :
+                                                                    this.flags & 33554432 /* Substitution */ ? "SubstitutionType" :
+                                                                        this.flags & 262144 /* TypeParameter */ ? "TypeParameter" :
+                                                                            this.flags & 524288 /* Object */ ?
+                                                                                this.objectFlags & 3 /* ClassOrInterface */ ? "InterfaceType" :
+                                                                                    this.objectFlags & 4 /* Reference */ ? "TypeReference" :
+                                                                                        this.objectFlags & 8 /* Tuple */ ? "TupleType" :
+                                                                                            this.objectFlags & 16 /* Anonymous */ ? "AnonymousType" :
+                                                                                                this.objectFlags & 32 /* Mapped */ ? "MappedType" :
+                                                                                                    this.objectFlags & 2048 /* ReverseMapped */ ? "ReverseMappedType" :
+                                                                                                        this.objectFlags & 256 /* EvolvingArray */ ? "EvolvingArrayType" :
+                                                                                                            "ObjectType" :
+                                                                                "Type";
+                        var remainingObjectFlags = this.flags & 524288 /* Object */ ? this.objectFlags & ~2367 /* ObjectTypeKindMask */ : 0;
+                        return "" + typeHeader + (this.symbol ? " '" + ts.symbolName(this.symbol) + "'" : "") + (remainingObjectFlags ? " (" + formatObjectFlags(remainingObjectFlags) + ")" : "");
+                    }
+                },
                 __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); } },
+                __debugTypeToString: {
+                    value: function () {
+                        // avoid recomputing
+                        var map = getWeakTypeTextMap();
+                        var text = map === null || map === void 0 ? void 0 : map.get(this);
+                        if (text === undefined) {
+                            text = this.checker.typeToString(this);
+                            map === null || map === void 0 ? void 0 : map.set(this, text);
+                        }
+                        return text;
+                    }
+                },
             });
             var nodeConstructors = [
                 ts.objectAllocator.getNodeConstructor(),
@@ -2737,6 +2895,49 @@ var ts;
                 var ctor = nodeConstructors_1[_i];
                 if (!ctor.prototype.hasOwnProperty("__debugKind")) {
                     Object.defineProperties(ctor.prototype, {
+                        // for use with vscode-js-debug's new customDescriptionGenerator in launch.json
+                        __tsDebuggerDisplay: {
+                            value: function () {
+                                var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
+                                    ts.isIdentifier(this) ? "Identifier '" + ts.idText(this) + "'" :
+                                        ts.isPrivateIdentifier(this) ? "PrivateIdentifier '" + ts.idText(this) + "'" :
+                                            ts.isStringLiteral(this) ? "StringLiteral " + JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...") :
+                                                ts.isNumericLiteral(this) ? "NumericLiteral " + this.text :
+                                                    ts.isBigIntLiteral(this) ? "BigIntLiteral " + this.text + "n" :
+                                                        ts.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
+                                                            ts.isParameter(this) ? "ParameterDeclaration" :
+                                                                ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
+                                                                    ts.isGetAccessorDeclaration(this) ? "GetAccessorDeclaration" :
+                                                                        ts.isSetAccessorDeclaration(this) ? "SetAccessorDeclaration" :
+                                                                            ts.isCallSignatureDeclaration(this) ? "CallSignatureDeclaration" :
+                                                                                ts.isConstructSignatureDeclaration(this) ? "ConstructSignatureDeclaration" :
+                                                                                    ts.isIndexSignatureDeclaration(this) ? "IndexSignatureDeclaration" :
+                                                                                        ts.isTypePredicateNode(this) ? "TypePredicateNode" :
+                                                                                            ts.isTypeReferenceNode(this) ? "TypeReferenceNode" :
+                                                                                                ts.isFunctionTypeNode(this) ? "FunctionTypeNode" :
+                                                                                                    ts.isConstructorTypeNode(this) ? "ConstructorTypeNode" :
+                                                                                                        ts.isTypeQueryNode(this) ? "TypeQueryNode" :
+                                                                                                            ts.isTypeLiteralNode(this) ? "TypeLiteralNode" :
+                                                                                                                ts.isArrayTypeNode(this) ? "ArrayTypeNode" :
+                                                                                                                    ts.isTupleTypeNode(this) ? "TupleTypeNode" :
+                                                                                                                        ts.isOptionalTypeNode(this) ? "OptionalTypeNode" :
+                                                                                                                            ts.isRestTypeNode(this) ? "RestTypeNode" :
+                                                                                                                                ts.isUnionTypeNode(this) ? "UnionTypeNode" :
+                                                                                                                                    ts.isIntersectionTypeNode(this) ? "IntersectionTypeNode" :
+                                                                                                                                        ts.isConditionalTypeNode(this) ? "ConditionalTypeNode" :
+                                                                                                                                            ts.isInferTypeNode(this) ? "InferTypeNode" :
+                                                                                                                                                ts.isParenthesizedTypeNode(this) ? "ParenthesizedTypeNode" :
+                                                                                                                                                    ts.isThisTypeNode(this) ? "ThisTypeNode" :
+                                                                                                                                                        ts.isTypeOperatorNode(this) ? "TypeOperatorNode" :
+                                                                                                                                                            ts.isIndexedAccessTypeNode(this) ? "IndexedAccessTypeNode" :
+                                                                                                                                                                ts.isMappedTypeNode(this) ? "MappedTypeNode" :
+                                                                                                                                                                    ts.isLiteralTypeNode(this) ? "LiteralTypeNode" :
+                                                                                                                                                                        ts.isNamedTupleMember(this) ? "NamedTupleMember" :
+                                                                                                                                                                            ts.isImportTypeNode(this) ? "ImportTypeNode" :
+                                                                                                                                                                                formatSyntaxKind(this.kind);
+                                return "" + nodeHeader + (this.flags ? " (" + formatNodeFlags(this.flags) + ")" : "");
+                            }
+                        },
                         __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
                         __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
                         __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getEffectiveModifierFlagsNoCache(this)); } },
@@ -2747,9 +2948,16 @@ var ts;
                             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) : "";
+                                // avoid recomputing
+                                var map = getWeakNodeTextMap();
+                                var text = map === null || map === void 0 ? void 0 : map.get(this);
+                                if (text === undefined) {
+                                    var parseNode = ts.getParseTreeNode(this);
+                                    var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                    text = sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                                    map === null || map === void 0 ? void 0 : map.set(this, text);
+                                }
+                                return text;
                             }
                         }
                     });
@@ -2821,168 +3029,6 @@ var ts;
         Debug.deprecate = deprecate;
     })(Debug = ts.Debug || (ts.Debug = {}));
 })(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. */
-var ts;
-(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 = new ts.Map();
-            marks = new ts.Map();
-            measures = new ts.Map();
-            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) {
-    var _a;
-    var nullLogger = {
-        logEvent: ts.noop,
-        logErrEvent: ts.noop,
-        logPerfEvent: ts.noop,
-        logInfoEvent: ts.noop,
-        logStartCommand: ts.noop,
-        logStopCommand: ts.noop,
-        logStartUpdateProgram: ts.noop,
-        logStopUpdateProgram: ts.noop,
-        logStartUpdateGraph: ts.noop,
-        logStopUpdateGraph: ts.noop,
-        logStartResolveModule: ts.noop,
-        logStopResolveModule: ts.noop,
-        logStartParseSourceFile: ts.noop,
-        logStopParseSourceFile: ts.noop,
-        logStartReadFile: ts.noop,
-        logStopReadFile: ts.noop,
-        logStartBindFile: ts.noop,
-        logStopBindFile: ts.noop,
-        logStartScheduledOperation: ts.noop,
-        logStopScheduledOperation: ts.noop,
-    };
-    // Load optional module to enable Event Tracing for Windows
-    // See https://github.com/microsoft/typescript-etw for more information
-    var etwModule;
-    try {
-        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
-        // require() will throw an exception if the module is not found
-        // It may also return undefined if not installed properly
-        etwModule = require(etwModulePath);
-    }
-    catch (e) {
-        etwModule = undefined;
-    }
-    /** Performance logger that will generate ETW events if possible - check for `logEvent` member, as `etwModule` will be `{}` when browserified */
-    ts.perfLogger = etwModule && etwModule.logEvent ? etwModule : nullLogger;
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -3059,7 +3105,7 @@ var ts;
             return ts.compareValues(this.major, other.major)
                 || ts.compareValues(this.minor, other.minor)
                 || ts.compareValues(this.patch, other.patch)
-                || comparePrerelaseIdentifiers(this.prerelease, other.prerelease);
+                || comparePrereleaseIdentifiers(this.prerelease, other.prerelease);
         };
         Version.prototype.increment = function (field) {
             switch (field) {
@@ -3098,7 +3144,7 @@ var ts;
             build: build
         };
     }
-    function comparePrerelaseIdentifiers(left, right) {
+    function comparePrereleaseIdentifiers(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.
@@ -3343,6 +3389,485 @@ var ts;
         return "" + comparator.operator + comparator.operand;
     }
 })(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    // The following definitions provide the minimum compatible support for the Web Performance User Timings API
+    // between browsers and NodeJS:
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    function hasRequiredAPI(performance, PerformanceObserver) {
+        return typeof performance === "object" &&
+            typeof performance.timeOrigin === "number" &&
+            typeof performance.mark === "function" &&
+            typeof performance.measure === "function" &&
+            typeof performance.now === "function" &&
+            typeof PerformanceObserver === "function";
+    }
+    function tryGetWebPerformanceHooks() {
+        if (typeof performance === "object" &&
+            typeof PerformanceObserver === "function" &&
+            hasRequiredAPI(performance, PerformanceObserver)) {
+            return {
+                performance: performance,
+                PerformanceObserver: PerformanceObserver
+            };
+        }
+    }
+    function tryGetNodePerformanceHooks() {
+        if (typeof module === "object" && typeof require === "function") {
+            try {
+                var _a = require("perf_hooks"), performance_1 = _a.performance, PerformanceObserver_1 = _a.PerformanceObserver;
+                if (hasRequiredAPI(performance_1, PerformanceObserver_1)) {
+                    // There is a bug in Node's performance.measure prior to 12.16.3/13.13.0 that does not
+                    // match the Web Performance API specification. Node's implementation did not allow
+                    // optional `start` and `end` arguments for `performance.measure`.
+                    // See https://github.com/nodejs/node/pull/32651 for more information.
+                    var version_1 = new ts.Version(process.versions.node);
+                    var range = new ts.VersionRange("<12.16.3 || 13 <13.13");
+                    if (range.test(version_1)) {
+                        return {
+                            performance: {
+                                get timeOrigin() { return performance_1.timeOrigin; },
+                                now: function () { return performance_1.now(); },
+                                mark: function (name) { return performance_1.mark(name); },
+                                measure: function (name, start, end) {
+                                    if (start === void 0) { start = "nodeStart"; }
+                                    if (end === undefined) {
+                                        end = "__performance.measure-fix__";
+                                        performance_1.mark(end);
+                                    }
+                                    performance_1.measure(name, start, end);
+                                    if (end === "__performance.measure-fix__") {
+                                        performance_1.clearMarks("__performance.measure-fix__");
+                                    }
+                                }
+                            },
+                            PerformanceObserver: PerformanceObserver_1
+                        };
+                    }
+                    return {
+                        performance: performance_1,
+                        PerformanceObserver: PerformanceObserver_1
+                    };
+                }
+            }
+            catch (_b) {
+                // ignore errors
+            }
+        }
+    }
+    // Unlike with the native Map/Set 'tryGet' functions in corePublic.ts, we eagerly evaluate these
+    // since we will need them for `timestamp`, below.
+    var nativePerformanceHooks = tryGetWebPerformanceHooks() || tryGetNodePerformanceHooks();
+    var nativePerformance = nativePerformanceHooks === null || nativePerformanceHooks === void 0 ? void 0 : nativePerformanceHooks.performance;
+    function tryGetNativePerformanceHooks() {
+        return nativePerformanceHooks;
+    }
+    ts.tryGetNativePerformanceHooks = tryGetNativePerformanceHooks;
+    /** Gets a timestamp with (at least) ms resolution */
+    ts.timestamp = nativePerformance ? function () { return nativePerformance.now(); } :
+        Date.now ? Date.now :
+            function () { return +(new Date()); };
+})(ts || (ts = {}));
+/*@internal*/
+/** Performance measurements for the compiler. */
+var ts;
+(function (ts) {
+    var performance;
+    (function (performance) {
+        var perfHooks;
+        var perfObserver;
+        // when set, indicates the implementation of `Performance` to use for user timing.
+        // when unset, indicates user timing is unavailable or disabled.
+        var performanceImpl;
+        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 };
+        var counts = new ts.Map();
+        var durations = new ts.Map();
+        /**
+         * Marks a performance event.
+         *
+         * @param markName The name of the mark.
+         */
+        function mark(markName) {
+            performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.mark(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) {
+            performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.measure(measureName, startMarkName, endMarkName);
+        }
+        performance.measure = measure;
+        /**
+         * Gets the number of times a marker was encountered.
+         *
+         * @param markName The name of the mark.
+         */
+        function getCount(markName) {
+            return 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 durations.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) {
+            durations.forEach(function (duration, measureName) { return cb(measureName, duration); });
+        }
+        performance.forEachMeasure = forEachMeasure;
+        /**
+         * Indicates whether the performance API is enabled.
+         */
+        function isEnabled() {
+            return !!performanceImpl;
+        }
+        performance.isEnabled = isEnabled;
+        /** Enables (and resets) performance measurements for the compiler. */
+        function enable() {
+            if (!performanceImpl) {
+                perfHooks || (perfHooks = ts.tryGetNativePerformanceHooks());
+                if (!perfHooks)
+                    return false;
+                perfObserver || (perfObserver = new perfHooks.PerformanceObserver(updateStatisticsFromList));
+                perfObserver.observe({ entryTypes: ["mark", "measure"] });
+                performanceImpl = perfHooks.performance;
+            }
+            return true;
+        }
+        performance.enable = enable;
+        /** Disables performance measurements for the compiler. */
+        function disable() {
+            perfObserver === null || perfObserver === void 0 ? void 0 : perfObserver.disconnect();
+            performanceImpl = undefined;
+            counts.clear();
+            durations.clear();
+        }
+        performance.disable = disable;
+        function updateStatisticsFromList(list) {
+            for (var _i = 0, _a = list.getEntriesByType("mark"); _i < _a.length; _i++) {
+                var mark_1 = _a[_i];
+                counts.set(mark_1.name, (counts.get(mark_1.name) || 0) + 1);
+            }
+            for (var _b = 0, _c = list.getEntriesByType("measure"); _b < _c.length; _b++) {
+                var measure_1 = _c[_b];
+                durations.set(measure_1.name, (durations.get(measure_1.name) || 0) + measure_1.duration);
+            }
+        }
+    })(performance = ts.performance || (ts.performance = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var _a;
+    var nullLogger = {
+        logEvent: ts.noop,
+        logErrEvent: ts.noop,
+        logPerfEvent: ts.noop,
+        logInfoEvent: ts.noop,
+        logStartCommand: ts.noop,
+        logStopCommand: ts.noop,
+        logStartUpdateProgram: ts.noop,
+        logStopUpdateProgram: ts.noop,
+        logStartUpdateGraph: ts.noop,
+        logStopUpdateGraph: ts.noop,
+        logStartResolveModule: ts.noop,
+        logStopResolveModule: ts.noop,
+        logStartParseSourceFile: ts.noop,
+        logStopParseSourceFile: ts.noop,
+        logStartReadFile: ts.noop,
+        logStopReadFile: ts.noop,
+        logStartBindFile: ts.noop,
+        logStopBindFile: ts.noop,
+        logStartScheduledOperation: ts.noop,
+        logStopScheduledOperation: ts.noop,
+    };
+    // Load optional module to enable Event Tracing for Windows
+    // See https://github.com/microsoft/typescript-etw for more information
+    var etwModule;
+    try {
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
+        // It may also return undefined if not installed properly
+        etwModule = require(etwModulePath);
+    }
+    catch (e) {
+        etwModule = undefined;
+    }
+    /** Performance logger that will generate ETW events if possible - check for `logEvent` member, as `etwModule` will be `{}` when browserified */
+    ts.perfLogger = etwModule && etwModule.logEvent ? etwModule : nullLogger;
+})(ts || (ts = {}));
+/*@internal*/
+/** Tracing events for the compiler. */
+var ts;
+(function (ts) {
+    var tracing;
+    (function (tracing) {
+        var fs;
+        var traceCount = 0;
+        var traceFd;
+        var legendPath;
+        var legend = [];
+        /** Starts tracing for the given project (unless the `fs` module is unavailable). */
+        function startTracing(configFilePath, traceDir, isBuildMode) {
+            ts.Debug.assert(!traceFd, "Tracing already started");
+            if (fs === undefined) {
+                try {
+                    fs = require("fs");
+                }
+                catch (_a) {
+                    fs = false;
+                }
+            }
+            if (!fs) {
+                return;
+            }
+            if (legendPath === undefined) {
+                legendPath = ts.combinePaths(traceDir, "legend.json");
+            }
+            // Note that writing will fail later on if it exists and is not a directory
+            if (!fs.existsSync(traceDir)) {
+                fs.mkdirSync(traceDir, { recursive: true });
+            }
+            var countPart = isBuildMode ? "." + ++traceCount : "";
+            var tracePath = ts.combinePaths(traceDir, "trace" + countPart + ".json");
+            var typesPath = ts.combinePaths(traceDir, "types" + countPart + ".json");
+            legend.push({
+                configFilePath: configFilePath,
+                tracePath: tracePath,
+                typesPath: typesPath,
+            });
+            traceFd = fs.openSync(tracePath, "w");
+            // Start with a prefix that contains some metadata that the devtools profiler expects (also avoids a warning on import)
+            var meta = { cat: "__metadata", ph: "M", ts: 1000 * ts.timestamp(), pid: 1, tid: 1 };
+            fs.writeSync(traceFd, "[\n"
+                + [__assign({ name: "process_name", args: { name: "tsc" } }, meta), __assign({ name: "thread_name", args: { name: "Main" } }, meta), __assign(__assign({ name: "TracingStartedInBrowser" }, meta), { cat: "disabled-by-default-devtools.timeline" })]
+                    .map(function (v) { return JSON.stringify(v); }).join(",\n"));
+        }
+        tracing.startTracing = startTracing;
+        /** Stops tracing for the in-progress project and dumps the type catalog (unless the `fs` module is unavailable). */
+        function stopTracing(typeCatalog) {
+            if (!traceFd) {
+                ts.Debug.assert(!fs, "Tracing is not in progress");
+                return;
+            }
+            ts.Debug.assert(fs);
+            fs.writeSync(traceFd, "\n]\n");
+            fs.closeSync(traceFd);
+            traceFd = undefined;
+            if (typeCatalog) {
+                dumpTypes(typeCatalog);
+            }
+            else {
+                // We pre-computed this path for convenience, but clear it
+                // now that the file won't be created.
+                legend[legend.length - 1].typesPath = undefined;
+            }
+        }
+        tracing.stopTracing = stopTracing;
+        function isTracing() {
+            return !!traceFd;
+        }
+        tracing.isTracing = isTracing;
+        var Phase;
+        (function (Phase) {
+            Phase["Parse"] = "parse";
+            Phase["Program"] = "program";
+            Phase["Bind"] = "bind";
+            Phase["Check"] = "check";
+            Phase["Emit"] = "emit";
+        })(Phase = tracing.Phase || (tracing.Phase = {}));
+        /** Note: `push`/`pop` should be used by default.
+         * `begin`/`end` are for special cases where we need the data point even if the event never
+         * terminates (typically for reducing a scenario too big to trace to one that can be completed).
+         * In the future we might implement an exit handler to dump unfinished events which would
+         * deprecate these operations.
+         */
+        function begin(phase, name, args) {
+            if (!traceFd)
+                return;
+            writeEvent("B", phase, name, args);
+        }
+        tracing.begin = begin;
+        function end(phase, name, args) {
+            if (!traceFd)
+                return;
+            writeEvent("E", phase, name, args);
+        }
+        tracing.end = end;
+        function instant(phase, name, args) {
+            if (!traceFd)
+                return;
+            writeEvent("I", phase, name, args, "\"s\":\"g\"");
+        }
+        tracing.instant = instant;
+        // Used for "Complete" (ph:"X") events
+        var completeEvents = [];
+        function push(phase, name, args) {
+            if (!traceFd)
+                return;
+            completeEvents.push({ phase: phase, name: name, args: args, time: 1000 * ts.timestamp() });
+        }
+        tracing.push = push;
+        function pop() {
+            if (!traceFd)
+                return;
+            ts.Debug.assert(completeEvents.length > 0);
+            var _a = completeEvents.pop(), phase = _a.phase, name = _a.name, args = _a.args, time = _a.time;
+            var dur = 1000 * ts.timestamp() - time;
+            writeEvent("X", phase, name, args, "\"dur\":" + dur, time);
+        }
+        tracing.pop = pop;
+        function writeEvent(eventType, phase, name, args, extras, time) {
+            if (time === void 0) { time = 1000 * ts.timestamp(); }
+            ts.Debug.assert(traceFd);
+            ts.Debug.assert(fs);
+            ts.performance.mark("beginTracing");
+            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"" + eventType + "\",\"cat\":\"" + phase + "\",\"ts\":" + time + ",\"name\":\"" + name + "\"");
+            if (extras)
+                fs.writeSync(traceFd, "," + extras);
+            if (args)
+                fs.writeSync(traceFd, ",\"args\":" + JSON.stringify(args));
+            fs.writeSync(traceFd, "}");
+            ts.performance.mark("endTracing");
+            ts.performance.measure("Tracing", "beginTracing", "endTracing");
+        }
+        function indexFromOne(lc) {
+            return {
+                line: lc.line + 1,
+                character: lc.character + 1,
+            };
+        }
+        function dumpTypes(types) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            ts.Debug.assert(fs);
+            ts.performance.mark("beginDumpTypes");
+            var typesPath = legend[legend.length - 1].typesPath;
+            var typesFd = fs.openSync(typesPath, "w");
+            var recursionIdentityMap = new ts.Map();
+            // Cleverness: no line break here so that the type ID will match the line number
+            fs.writeSync(typesFd, "[");
+            var numTypes = types.length;
+            for (var i = 0; i < numTypes; i++) {
+                var type = types[i];
+                var objectFlags = type.objectFlags;
+                var symbol = (_a = type.aliasSymbol) !== null && _a !== void 0 ? _a : type.symbol;
+                var firstDeclaration = (_b = symbol === null || symbol === void 0 ? void 0 : symbol.declarations) === null || _b === void 0 ? void 0 : _b[0];
+                var firstFile = firstDeclaration && ts.getSourceFileOfNode(firstDeclaration);
+                // It's slow to compute the display text, so skip it unless it's really valuable (or cheap)
+                var display = void 0;
+                if ((objectFlags & 16 /* Anonymous */) | (type.flags & 2944 /* Literal */)) {
+                    try {
+                        display = (_c = type.checker) === null || _c === void 0 ? void 0 : _c.typeToString(type);
+                    }
+                    catch (_s) {
+                        display = undefined;
+                    }
+                }
+                var indexedAccessProperties = {};
+                if (type.flags & 8388608 /* IndexedAccess */) {
+                    var indexedAccessType = type;
+                    indexedAccessProperties = {
+                        indexedAccessObjectType: (_d = indexedAccessType.objectType) === null || _d === void 0 ? void 0 : _d.id,
+                        indexedAccessIndexType: (_e = indexedAccessType.indexType) === null || _e === void 0 ? void 0 : _e.id,
+                    };
+                }
+                var referenceProperties = {};
+                if (objectFlags & 4 /* Reference */) {
+                    var referenceType = type;
+                    referenceProperties = {
+                        instantiatedType: (_f = referenceType.target) === null || _f === void 0 ? void 0 : _f.id,
+                        typeArguments: (_g = referenceType.resolvedTypeArguments) === null || _g === void 0 ? void 0 : _g.map(function (t) { return t.id; }),
+                    };
+                }
+                var conditionalProperties = {};
+                if (type.flags & 16777216 /* Conditional */) {
+                    var conditionalType = type;
+                    conditionalProperties = {
+                        conditionalCheckType: (_h = conditionalType.checkType) === null || _h === void 0 ? void 0 : _h.id,
+                        conditionalExtendsType: (_j = conditionalType.extendsType) === null || _j === void 0 ? void 0 : _j.id,
+                        conditionalTrueType: (_l = (_k = conditionalType.resolvedTrueType) === null || _k === void 0 ? void 0 : _k.id) !== null && _l !== void 0 ? _l : -1,
+                        conditionalFalseType: (_o = (_m = conditionalType.resolvedFalseType) === null || _m === void 0 ? void 0 : _m.id) !== null && _o !== void 0 ? _o : -1,
+                    };
+                }
+                // We can't print out an arbitrary object, so just assign each one a unique number.
+                // Don't call it an "id" so people don't treat it as a type id.
+                var recursionToken = void 0;
+                var recursionIdentity = type.checker.getRecursionIdentity(type);
+                if (recursionIdentity) {
+                    recursionToken = recursionIdentityMap.get(recursionIdentity);
+                    if (!recursionToken) {
+                        recursionToken = recursionIdentityMap.size;
+                        recursionIdentityMap.set(recursionIdentity, recursionToken);
+                    }
+                }
+                var descriptor = __assign(__assign(__assign(__assign({ id: type.id, intrinsicName: type.intrinsicName, symbolName: (symbol === null || symbol === void 0 ? void 0 : symbol.escapedName) && ts.unescapeLeadingUnderscores(symbol.escapedName), recursionId: recursionToken, unionTypes: (type.flags & 1048576 /* Union */) ? (_p = type.types) === null || _p === void 0 ? void 0 : _p.map(function (t) { return t.id; }) : undefined, intersectionTypes: (type.flags & 2097152 /* Intersection */) ? type.types.map(function (t) { return t.id; }) : undefined, aliasTypeArguments: (_q = type.aliasTypeArguments) === null || _q === void 0 ? void 0 : _q.map(function (t) { return t.id; }), keyofType: (type.flags & 4194304 /* Index */) ? (_r = type.type) === null || _r === void 0 ? void 0 : _r.id : undefined }, indexedAccessProperties), referenceProperties), conditionalProperties), { firstDeclaration: firstDeclaration && {
+                        path: firstFile.path,
+                        start: indexFromOne(ts.getLineAndCharacterOfPosition(firstFile, firstDeclaration.pos)),
+                        end: indexFromOne(ts.getLineAndCharacterOfPosition(ts.getSourceFileOfNode(firstDeclaration), firstDeclaration.end)),
+                    }, flags: ts.Debug.formatTypeFlags(type.flags).split("|"), display: display });
+                fs.writeSync(typesFd, JSON.stringify(descriptor));
+                if (i < numTypes - 1) {
+                    fs.writeSync(typesFd, ",\n");
+                }
+            }
+            fs.writeSync(typesFd, "]\n");
+            fs.closeSync(typesFd);
+            ts.performance.mark("endDumpTypes");
+            ts.performance.measure("Dump types", "beginDumpTypes", "endDumpTypes");
+        }
+        function dumpLegend() {
+            if (!legendPath) {
+                return;
+            }
+            ts.Debug.assert(fs);
+            fs.writeFileSync(legendPath, JSON.stringify(legend));
+        }
+        tracing.dumpLegend = dumpLegend;
+    })(tracing = ts.tracing || (ts.tracing = {}));
+})(ts || (ts = {}));
 var ts;
 (function (ts) {
     // token > SyntaxKind.Identifier => token is a keyword
@@ -3497,230 +4022,235 @@ var ts;
         SyntaxKind[SyntaxKind["DeclareKeyword"] = 133] = "DeclareKeyword";
         SyntaxKind[SyntaxKind["GetKeyword"] = 134] = "GetKeyword";
         SyntaxKind[SyntaxKind["InferKeyword"] = 135] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 136] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 137] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 138] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 139] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 140] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 141] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 142] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 143] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 144] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 145] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 146] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 147] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 148] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 149] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 150] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 151] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 152] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 153] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 154] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 155] = "OfKeyword";
+        SyntaxKind[SyntaxKind["IntrinsicKeyword"] = 136] = "IntrinsicKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 137] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 138] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 139] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 140] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 141] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 142] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 143] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 144] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 145] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 146] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 147] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 148] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 149] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 150] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 151] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 152] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 153] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 154] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 155] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 156] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 156] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 157] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 157] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 158] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 158] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 159] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 160] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 159] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 160] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 161] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 161] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 162] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 163] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 164] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 165] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 166] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 167] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 168] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 169] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 170] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 162] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 163] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 164] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 165] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 166] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 167] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 168] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 169] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 170] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 171] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 171] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 172] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 173] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 174] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 175] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 176] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 177] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 178] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 179] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 180] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 181] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 182] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 183] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 184] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 185] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 186] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 187] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 188] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 189] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 190] = "LiteralType";
-        SyntaxKind[SyntaxKind["NamedTupleMember"] = 191] = "NamedTupleMember";
-        SyntaxKind[SyntaxKind["ImportType"] = 192] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 172] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 173] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 174] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 175] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 176] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 177] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 178] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 179] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 180] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 181] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 182] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 183] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 184] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 185] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 186] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 187] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 188] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 189] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 190] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 191] = "LiteralType";
+        SyntaxKind[SyntaxKind["NamedTupleMember"] = 192] = "NamedTupleMember";
+        SyntaxKind[SyntaxKind["TemplateLiteralType"] = 193] = "TemplateLiteralType";
+        SyntaxKind[SyntaxKind["TemplateLiteralTypeSpan"] = 194] = "TemplateLiteralTypeSpan";
+        SyntaxKind[SyntaxKind["ImportType"] = 195] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 193] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 194] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 195] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 196] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 197] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 198] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 196] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 197] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 198] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 199] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 200] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 201] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 202] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 203] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 204] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 205] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 206] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 207] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 208] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 209] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 210] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 211] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 212] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 213] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 214] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 215] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 216] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 217] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 218] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 219] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 220] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 221] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 222] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 223] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 224] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 199] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 200] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 201] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 202] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 203] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 204] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 205] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 206] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 207] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 208] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 209] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 210] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 211] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 212] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 213] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 214] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 215] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 216] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 217] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 218] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 219] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 220] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 221] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 222] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 223] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 224] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 225] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 226] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 227] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 225] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 226] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 228] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 229] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 227] = "Block";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 228] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 229] = "VariableStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 230] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 231] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 232] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 233] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 234] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 235] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 236] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 237] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 238] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 239] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 240] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 241] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 242] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 243] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 244] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 245] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 246] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 247] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 248] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 249] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 250] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 251] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 252] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 253] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 254] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 255] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 256] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 257] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 258] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 259] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 260] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 261] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 262] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 263] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 264] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 265] = "NamedExports";
-        SyntaxKind[SyntaxKind["NamespaceExport"] = 266] = "NamespaceExport";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 267] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 268] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 230] = "Block";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 231] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 232] = "VariableStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 233] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 234] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 235] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 236] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 237] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 238] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 239] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 240] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 241] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 242] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 243] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 244] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 245] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 246] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 247] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 248] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 249] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 250] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 251] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 252] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 253] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 254] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 255] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 256] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 257] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 258] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 259] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 260] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 261] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 262] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 263] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 264] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 265] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 266] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 267] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 268] = "NamedExports";
+        SyntaxKind[SyntaxKind["NamespaceExport"] = 269] = "NamespaceExport";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 270] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 271] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 269] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 272] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 270] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 271] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 272] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 273] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 274] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 275] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 276] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 277] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 278] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 279] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 280] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 273] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 274] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 275] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 276] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 277] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 278] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 279] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 280] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 281] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 282] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 283] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 281] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 282] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 283] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 284] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 284] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 285] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 286] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 287] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 285] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 286] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 287] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 288] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 289] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 290] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 288] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 291] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 289] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 290] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 291] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 292] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 293] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 292] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 293] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 294] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 295] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 296] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 294] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 295] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 296] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 297] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 297] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 298] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 299] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 300] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 298] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 301] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocNameReference"] = 302] = "JSDocNameReference";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 299] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 303] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 300] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 301] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 302] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 303] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 304] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 305] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 304] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 305] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 306] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 307] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 308] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 309] = "JSDocVariadicType";
         // https://jsdoc.app/about-namepaths.html
-        SyntaxKind[SyntaxKind["JSDocNamepathType"] = 306] = "JSDocNamepathType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 307] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 308] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 309] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 310] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 311] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocImplementsTag"] = 312] = "JSDocImplementsTag";
-        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 313] = "JSDocAuthorTag";
-        SyntaxKind[SyntaxKind["JSDocDeprecatedTag"] = 314] = "JSDocDeprecatedTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 315] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocPublicTag"] = 316] = "JSDocPublicTag";
-        SyntaxKind[SyntaxKind["JSDocPrivateTag"] = 317] = "JSDocPrivateTag";
-        SyntaxKind[SyntaxKind["JSDocProtectedTag"] = 318] = "JSDocProtectedTag";
-        SyntaxKind[SyntaxKind["JSDocReadonlyTag"] = 319] = "JSDocReadonlyTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 320] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 321] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 322] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 323] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 324] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 325] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 326] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 327] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 328] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocNamepathType"] = 310] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 311] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 312] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 313] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 314] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 315] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocImplementsTag"] = 316] = "JSDocImplementsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 317] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocDeprecatedTag"] = 318] = "JSDocDeprecatedTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 319] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocPublicTag"] = 320] = "JSDocPublicTag";
+        SyntaxKind[SyntaxKind["JSDocPrivateTag"] = 321] = "JSDocPrivateTag";
+        SyntaxKind[SyntaxKind["JSDocProtectedTag"] = 322] = "JSDocProtectedTag";
+        SyntaxKind[SyntaxKind["JSDocReadonlyTag"] = 323] = "JSDocReadonlyTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 324] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 325] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 326] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 327] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 328] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 329] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 330] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 331] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocSeeTag"] = 332] = "JSDocSeeTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 333] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 329] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 334] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 330] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 331] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 332] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 333] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 334] = "EndOfDeclarationMarker";
-        SyntaxKind[SyntaxKind["SyntheticReferenceExpression"] = 335] = "SyntheticReferenceExpression";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 335] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 336] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 337] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 338] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 339] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["SyntheticReferenceExpression"] = 340] = "SyntheticReferenceExpression";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 336] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 341] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 62] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 77] = "LastAssignment";
@@ -3729,15 +4259,15 @@ var ts;
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 80] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 115] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 80] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 155] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 156] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 116] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 124] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 171] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 192] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 172] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 195] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 77] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 155] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 156] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -3746,15 +4276,15 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 29] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 77] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstStatement"] = 229] = "FirstStatement";
-        SyntaxKind[SyntaxKind["LastStatement"] = 245] = "LastStatement";
-        SyntaxKind[SyntaxKind["FirstNode"] = 156] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 298] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 328] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 310] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 328] = "LastJSDocTagNode";
+        SyntaxKind[SyntaxKind["FirstStatement"] = 232] = "FirstStatement";
+        SyntaxKind[SyntaxKind["LastStatement"] = 248] = "LastStatement";
+        SyntaxKind[SyntaxKind["FirstNode"] = 157] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 301] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 333] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 314] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 333] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 125] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 155] = "LastContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 156] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3865,6 +4395,7 @@ var ts;
         GeneratedIdentifierFlags[GeneratedIdentifierFlags["ReservedInNestedScopes"] = 8] = "ReservedInNestedScopes";
         GeneratedIdentifierFlags[GeneratedIdentifierFlags["Optimistic"] = 16] = "Optimistic";
         GeneratedIdentifierFlags[GeneratedIdentifierFlags["FileLevel"] = 32] = "FileLevel";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["AllowNameSubstitution"] = 64] = "AllowNameSubstitution";
     })(GeneratedIdentifierFlags = ts.GeneratedIdentifierFlags || (ts.GeneratedIdentifierFlags = {}));
     var TokenFlags;
     (function (TokenFlags) {
@@ -4308,6 +4839,8 @@ var ts;
         TypeFlags[TypeFlags["Conditional"] = 16777216] = "Conditional";
         TypeFlags[TypeFlags["Substitution"] = 33554432] = "Substitution";
         TypeFlags[TypeFlags["NonPrimitive"] = 67108864] = "NonPrimitive";
+        TypeFlags[TypeFlags["TemplateLiteral"] = 134217728] = "TemplateLiteral";
+        TypeFlags[TypeFlags["StringMapping"] = 268435456] = "StringMapping";
         /* @internal */
         TypeFlags[TypeFlags["AnyOrUnknown"] = 3] = "AnyOrUnknown";
         /* @internal */
@@ -4324,7 +4857,7 @@ var ts;
         TypeFlags[TypeFlags["Intrinsic"] = 67359327] = "Intrinsic";
         /* @internal */
         TypeFlags[TypeFlags["Primitive"] = 131068] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 132] = "StringLike";
+        TypeFlags[TypeFlags["StringLike"] = 402653316] = "StringLike";
         TypeFlags[TypeFlags["NumberLike"] = 296] = "NumberLike";
         TypeFlags[TypeFlags["BigIntLike"] = 2112] = "BigIntLike";
         TypeFlags[TypeFlags["BooleanLike"] = 528] = "BooleanLike";
@@ -4332,28 +4865,28 @@ var ts;
         TypeFlags[TypeFlags["ESSymbolLike"] = 12288] = "ESSymbolLike";
         TypeFlags[TypeFlags["VoidLike"] = 49152] = "VoidLike";
         /* @internal */
-        TypeFlags[TypeFlags["DisjointDomains"] = 67238908] = "DisjointDomains";
+        TypeFlags[TypeFlags["DisjointDomains"] = 469892092] = "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";
+        TypeFlags[TypeFlags["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive";
+        TypeFlags[TypeFlags["Instantiable"] = 465829888] = "Instantiable";
+        TypeFlags[TypeFlags["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable";
         /* @internal */
         TypeFlags[TypeFlags["ObjectFlagsType"] = 3899393] = "ObjectFlagsType";
         /* @internal */
         TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         /* @internal */
-        TypeFlags[TypeFlags["Substructure"] = 66584576] = "Substructure";
+        TypeFlags[TypeFlags["Substructure"] = 469237760] = "Substructure";
         // '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["Narrowable"] = 536624127] = "Narrowable";
         /* @internal */
-        TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
+        TypeFlags[TypeFlags["NotPrimitiveUnion"] = 469647395] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 71041023] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 205258751] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -4410,11 +4943,16 @@ var ts;
         ObjectFlags[ObjectFlags["IsNeverIntersectionComputed"] = 268435456] = "IsNeverIntersectionComputed";
         /* @internal */
         ObjectFlags[ObjectFlags["IsNeverIntersection"] = 536870912] = "IsNeverIntersection";
+        /* @internal */
+        ObjectFlags[ObjectFlags["IsClassInstanceClone"] = 1073741824] = "IsClassInstanceClone";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
         ObjectFlags[ObjectFlags["RequiresWidening"] = 1572864] = "RequiresWidening";
         /* @internal */
         ObjectFlags[ObjectFlags["PropagatingFlags"] = 3670016] = "PropagatingFlags";
+        // Object flags that uniquely identify the kind of ObjectType
+        /* @internal */
+        ObjectFlags[ObjectFlags["ObjectTypeKindMask"] = 2367] = "ObjectTypeKindMask";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
     var VarianceFlags;
@@ -4504,18 +5042,18 @@ var ts;
     })(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.
+     * x & y picks the lesser in the order False < Unknown < Maybe < True, and
+     * x | y picks the greater in the order False < Unknown < Maybe < True.
+     * Generally, Ternary.Maybe is used as the result of a relation that depends on itself, and
+     * Ternary.Unknown is used as the result of a variance check that depends on itself. We make
+     * a distinction because we don't want to cache circular variance check results.
      */
     /* @internal */
     var Ternary;
     (function (Ternary) {
         Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
+        Ternary[Ternary["Unknown"] = 1] = "Unknown";
+        Ternary[Ternary["Maybe"] = 3] = "Maybe";
         Ternary[Ternary["True"] = -1] = "True";
     })(Ternary = ts.Ternary || (ts.Ternary = {}));
     /* @internal */
@@ -4523,6 +5061,7 @@ var ts;
     (function (AssignmentDeclarationKind) {
         AssignmentDeclarationKind[AssignmentDeclarationKind["None"] = 0] = "None";
         /// exports.name = expr
+        /// module.exports.name = expr
         AssignmentDeclarationKind[AssignmentDeclarationKind["ExportsProperty"] = 1] = "ExportsProperty";
         /// module.exports = expr
         AssignmentDeclarationKind[AssignmentDeclarationKind["ModuleExports"] = 2] = "ModuleExports";
@@ -4603,6 +5142,8 @@ var ts;
         JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
         JsxEmit[JsxEmit["React"] = 2] = "React";
         JsxEmit[JsxEmit["ReactNative"] = 3] = "ReactNative";
+        JsxEmit[JsxEmit["ReactJSX"] = 4] = "ReactJSX";
+        JsxEmit[JsxEmit["ReactJSXDev"] = 5] = "ReactJSXDev";
     })(JsxEmit = ts.JsxEmit || (ts.JsxEmit = {}));
     var ImportsNotUsedAsValues;
     (function (ImportsNotUsedAsValues) {
@@ -5121,8 +5662,696 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
+        "jsximportsource": {
+            args: [{ name: "factory" }],
+            kind: 4 /* MultiLine */
+        },
+        "jsxruntime": {
+            args: [{ name: "factory" }],
+            kind: 4 /* MultiLine */
+        },
     };
 })(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    /**
+     * 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;
+    //// Path Tests
+    /**
+     * Determines whether a charCode corresponds to `/` or `\`.
+     */
+    function isAnyDirectorySeparator(charCode) {
+        return charCode === 47 /* slash */ || charCode === 92 /* backslash */;
+    }
+    ts.isAnyDirectorySeparator = isAnyDirectorySeparator;
+    /**
+     * Determines whether a path starts with a URL scheme (e.g. starts with `http://`, `ftp://`, `file://`, etc.).
+     */
+    function isUrl(path) {
+        return getEncodedRootLength(path) < 0;
+    }
+    ts.isUrl = isUrl;
+    /**
+     * Determines whether a path is an absolute disk 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;
+    /**
+     * Determines whether a path starts with an absolute path component (i.e. `/`, `c:/`, `file://`, etc.).
+     *
+     * ```ts
+     * // POSIX
+     * pathIsAbsolute("/path/to/file.ext") === true
+     * // DOS
+     * pathIsAbsolute("c:/path/to/file.ext") === true
+     * // URL
+     * pathIsAbsolute("file:///path/to/file.ext") === true
+     * // Non-absolute
+     * pathIsAbsolute("path/to/file.ext") === false
+     * pathIsAbsolute("./path/to/file.ext") === false
+     * ```
+     */
+    function pathIsAbsolute(path) {
+        return getEncodedRootLength(path) !== 0;
+    }
+    ts.pathIsAbsolute = pathIsAbsolute;
+    /**
+     * Determines whether a path starts with a relative path component (i.e. `.` or `..`).
+     */
+    function pathIsRelative(path) {
+        return /^\.\.?($|[\\/])/.test(path);
+    }
+    ts.pathIsRelative = pathIsRelative;
+    /**
+     * Determines whether a path is neither relative nor absolute, e.g. "path/to/file".
+     * Also known misleadingly as "non-relative".
+     */
+    function pathIsBareSpecifier(path) {
+        return !pathIsAbsolute(path) && !pathIsRelative(path);
+    }
+    ts.pathIsBareSpecifier = pathIsBareSpecifier;
+    function hasExtension(fileName) {
+        return ts.stringContains(getBaseFileName(fileName), ".");
+    }
+    ts.hasExtension = hasExtension;
+    function fileExtensionIs(path, extension) {
+        return path.length > extension.length && ts.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;
+    /**
+     * Determines whether a path has a trailing separator (`/` or `\\`).
+     */
+    function hasTrailingDirectorySeparator(path) {
+        return path.length > 0 && isAnyDirectorySeparator(path.charCodeAt(path.length - 1));
+    }
+    ts.hasTrailingDirectorySeparator = hasTrailingDirectorySeparator;
+    //// Path Parsing
+    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;
+    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 = removeTrailingDirectorySeparator(path);
+        return path.slice(0, Math.max(rootLength, path.lastIndexOf(ts.directorySeparator)));
+    }
+    ts.getDirectoryPath = getDirectoryPath;
+    function getBaseFileName(path, extensions, ignoreCase) {
+        path = normalizeSlashes(path);
+        // if the path provided is itself the root, then it has not file name.
+        var rootLength = 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(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;
+    function tryGetExtensionFromPath(path, extension, stringEqualityComparer) {
+        if (!ts.startsWith(extension, "."))
+            extension = "." + extension;
+        if (path.length >= extension.length && path.charCodeAt(path.length - extension.length) === 46 /* dot */) {
+            var pathExtension = path.slice(path.length - extension.length);
+            if (stringEqualityComparer(pathExtension, extension)) {
+                return pathExtension;
+            }
+        }
+    }
+    function getAnyExtensionFromPathWorker(path, extensions, stringEqualityComparer) {
+        if (typeof extensions === "string") {
+            return tryGetExtensionFromPath(path, extensions, stringEqualityComparer) || "";
+        }
+        for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
+            var extension = extensions_2[_i];
+            var result = tryGetExtensionFromPath(path, extension, stringEqualityComparer);
+            if (result)
+                return result;
+        }
+        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(removeTrailingDirectorySeparator(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 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 __spreadArrays([root], 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 (`/`).
+     *
+     * ```ts
+     * // POSIX
+     * getPathComponents("/path/to/file.ext") === ["/", "path", "to", "file.ext"]
+     * getPathComponents("/path/to/") === ["/", "path", "to"]
+     * getPathComponents("/") === ["/"]
+     * // DOS
+     * getPathComponents("c:/path/to/file.ext") === ["c:/", "path", "to", "file.ext"]
+     * getPathComponents("c:/path/to/") === ["c:/", "path", "to"]
+     * getPathComponents("c:/") === ["c:/"]
+     * getPathComponents("c:") === ["c:"]
+     * // URL
+     * getPathComponents("http://typescriptlang.org/path/to/file.ext") === ["http://typescriptlang.org/", "path", "to", "file.ext"]
+     * getPathComponents("http://typescriptlang.org/path/to/") === ["http://typescriptlang.org/", "path", "to"]
+     * getPathComponents("http://typescriptlang.org/") === ["http://typescriptlang.org/"]
+     * getPathComponents("http://typescriptlang.org") === ["http://typescriptlang.org"]
+     * getPathComponents("file://server/path/to/file.ext") === ["file://server/", "path", "to", "file.ext"]
+     * getPathComponents("file://server/path/to/") === ["file://server/", "path", "to"]
+     * getPathComponents("file://server/") === ["file://server/"]
+     * getPathComponents("file://server") === ["file://server"]
+     * getPathComponents("file:///path/to/file.ext") === ["file:///", "path", "to", "file.ext"]
+     * getPathComponents("file:///path/to/") === ["file:///", "path", "to"]
+     * getPathComponents("file:///") === ["file:///"]
+     * getPathComponents("file://") === ["file://"]
+     */
+    function getPathComponents(path, currentDirectory) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
+        path = combinePaths(currentDirectory, path);
+        return pathComponents(path, getRootLength(path));
+    }
+    ts.getPathComponents = getPathComponents;
+    //// Path Formatting
+    /**
+     * Formats a parsed path consisting of a root component (at index 0) and zero or more path
+     * segments (at indices > 0).
+     *
+     * ```ts
+     * getPathFromPathComponents(["/", "path", "to", "file.ext"]) === "/path/to/file.ext"
+     * ```
+     */
+    function getPathFromPathComponents(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        var root = pathComponents[0] && ensureTrailingDirectorySeparator(pathComponents[0]);
+        return root + pathComponents.slice(1).join(ts.directorySeparator);
+    }
+    ts.getPathFromPathComponents = getPathFromPathComponents;
+    //// Path Normalization
+    /**
+     * Normalize path separators, converting `\` into `/`.
+     */
+    function normalizeSlashes(path) {
+        return path.replace(backslashRegExp, ts.directorySeparator);
+    }
+    ts.normalizeSlashes = normalizeSlashes;
+    /**
+     * 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;
+    /**
+     * Combines paths. If a path is absolute, it replaces any previous path. Relative paths are not simplified.
+     *
+     * ```ts
+     * // Non-rooted
+     * combinePaths("path", "to", "file.ext") === "path/to/file.ext"
+     * combinePaths("path", "dir", "..", "to", "file.ext") === "path/dir/../to/file.ext"
+     * // POSIX
+     * combinePaths("/path", "to", "file.ext") === "/path/to/file.ext"
+     * combinePaths("/path", "/to", "file.ext") === "/to/file.ext"
+     * // DOS
+     * combinePaths("c:/path", "to", "file.ext") === "c:/path/to/file.ext"
+     * combinePaths("c:/path", "c:/to", "file.ext") === "c:/to/file.ext"
+     * // URL
+     * combinePaths("file:///path", "to", "file.ext") === "file:///path/to/file.ext"
+     * combinePaths("file:///path", "file:///to", "file.ext") === "file:///to/file.ext"
+     * ```
+     */
+    function combinePaths(path) {
+        var paths = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            paths[_i - 1] = arguments[_i];
+        }
+        if (path)
+            path = normalizeSlashes(path);
+        for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
+            var relativePath = paths_1[_a];
+            if (!relativePath)
+                continue;
+            relativePath = normalizeSlashes(relativePath);
+            if (!path || 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. Trailing directory separators are preserved.
+     *
+     * ```ts
+     * resolvePath("/path", "to", "file.ext") === "path/to/file.ext"
+     * resolvePath("/path", "to", "file.ext/") === "path/to/file.ext/"
+     * resolvePath("/path", "dir", "..", "to", "file.ext") === "path/to/file.ext"
+     * ```
+     */
+    function resolvePath(path) {
+        var paths = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            paths[_i - 1] = arguments[_i];
+        }
+        return normalizePath(ts.some(paths) ? combinePaths.apply(void 0, __spreadArrays([path], paths)) : normalizeSlashes(path));
+    }
+    ts.resolvePath = resolvePath;
+    /**
+     * 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 (`/`).
+     *
+     * ```ts
+     * getNormalizedPathComponents("to/dir/../file.ext", "/path/") === ["/", "path", "to", "file.ext"]
+     * ```
+     */
+    function getNormalizedPathComponents(path, currentDirectory) {
+        return reducePathComponents(getPathComponents(path, currentDirectory));
+    }
+    ts.getNormalizedPathComponents = getNormalizedPathComponents;
+    function getNormalizedAbsolutePath(fileName, currentDirectory) {
+        return getPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePath = getNormalizedAbsolutePath;
+    function normalizePath(path) {
+        path = normalizeSlashes(path);
+        var normalized = getPathFromPathComponents(reducePathComponents(getPathComponents(path)));
+        return normalized && hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(normalized) : normalized;
+    }
+    ts.normalizePath = normalizePath;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
+    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: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
+        }
+        else {
+            return { path: root, parts: parts };
+        }
+    }
+    ts.normalizePathAndParts = normalizePathAndParts;
+    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;
+    /**
+     * 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.
+     *
+     * ```ts
+     * ensurePathIsNonModuleName("/path/to/file.ext") === "/path/to/file.ext"
+     * ensurePathIsNonModuleName("./path/to/file.ext") === "./path/to/file.ext"
+     * ensurePathIsNonModuleName("../path/to/file.ext") === "../path/to/file.ext"
+     * ensurePathIsNonModuleName("path/to/file.ext") === "./path/to/file.ext"
+     * ```
+     */
+    function ensurePathIsNonModuleName(path) {
+        return !pathIsAbsolute(path) && !pathIsRelative(path) ? "./" + path : path;
+    }
+    ts.ensurePathIsNonModuleName = ensurePathIsNonModuleName;
+    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;
+    //// Path Comparisons
+    // 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, getRootLength(a));
+        var bRoot = b.substring(0, 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 = reducePathComponents(getPathComponents(a));
+        var bComponents = reducePathComponents(getPathComponents(b));
+        var sharedLength = Math.min(aComponents.length, bComponents.length);
+        for (var i = 1; i < sharedLength; i++) {
+            var result_2 = componentComparer(aComponents[i], bComponents[i]);
+            if (result_2 !== 0 /* EqualTo */) {
+                return result_2;
+            }
+        }
+        return ts.compareValues(aComponents.length, bComponents.length);
+    }
+    /**
+     * Performs a case-sensitive comparison of two paths. Path roots are always compared case-insensitively.
+     */
+    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 = reducePathComponents(getPathComponents(parent));
+        var childComponents = reducePathComponents(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;
+    /**
+     * Determines whether `fileName` starts with the specified `directoryName` using the provided path canonicalization callback.
+     * Comparison is case-sensitive between the canonical paths.
+     *
+     * @deprecated Use `containsPath` if possible.
+     */
+    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;
+    //// Relative Paths
+    function getPathComponentsRelativeTo(from, to, stringEqualityComparer, getCanonicalFileName) {
+        var fromComponents = reducePathComponents(getPathComponents(from));
+        var toComponents = reducePathComponents(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 __spreadArrays([""], relative, components);
+    }
+    ts.getPathComponentsRelativeTo = getPathComponentsRelativeTo;
+    function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
+        ts.Debug.assert((getRootLength(fromDirectory) > 0) === (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 getPathFromPathComponents(pathComponents);
+    }
+    ts.getRelativePathFromDirectory = getRelativePathFromDirectory;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
+    function getRelativePathFromFile(from, to, getCanonicalFileName) {
+        return ensurePathIsNonModuleName(getRelativePathFromDirectory(getDirectoryPath(from), to, getCanonicalFileName));
+    }
+    ts.getRelativePathFromFile = getRelativePathFromFile;
+    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 && isRootedDiskPath(firstComponent)) {
+            var prefix = firstComponent.charAt(0) === ts.directorySeparator ? "file://" : "file:///";
+            pathComponents[0] = prefix + firstComponent;
+        }
+        return getPathFromPathComponents(pathComponents);
+    }
+    ts.getRelativePathToDirectoryOrUrl = getRelativePathToDirectoryOrUrl;
+    function forEachAncestorDirectory(directory, callback) {
+        while (true) {
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
+            }
+            var parentPath = getDirectoryPath(directory);
+            if (parentPath === directory) {
+                return undefined;
+            }
+            directory = parentPath;
+        }
+    }
+    ts.forEachAncestorDirectory = forEachAncestorDirectory;
+    function isNodeModulesDirectory(dirPath) {
+        return ts.endsWith(dirPath, "/node_modules");
+    }
+    ts.isNodeModulesDirectory = isNodeModulesDirectory;
+})(ts || (ts = {}));
 var ts;
 (function (ts) {
     /**
@@ -6368,6 +7597,10 @@ var ts;
                 return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
+                // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
+                // the CPU time performance.
+                var originalStackTraceLimit = Error.stackTraceLimit;
+                Error.stackTraceLimit = 0;
                 try {
                     var stat = _fs.statSync(path);
                     switch (entryKind) {
@@ -6379,6 +7612,9 @@ var ts;
                 catch (e) {
                     return false;
                 }
+                finally {
+                    Error.stackTraceLimit = originalStackTraceLimit;
+                }
             }
             function fileExists(path) {
                 return fileSystemEntryExists(path, 0 /* File */);
@@ -6449,678 +7685,6 @@ var ts;
         ts.Debug.isDebugging = true;
     }
 })(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    /**
-     * 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;
-    //// Path Tests
-    /**
-     * Determines whether a charCode corresponds to `/` or `\`.
-     */
-    function isAnyDirectorySeparator(charCode) {
-        return charCode === 47 /* slash */ || charCode === 92 /* backslash */;
-    }
-    ts.isAnyDirectorySeparator = isAnyDirectorySeparator;
-    /**
-     * Determines whether a path starts with a URL scheme (e.g. starts with `http://`, `ftp://`, `file://`, etc.).
-     */
-    function isUrl(path) {
-        return getEncodedRootLength(path) < 0;
-    }
-    ts.isUrl = isUrl;
-    /**
-     * Determines whether a path is an absolute disk 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;
-    /**
-     * Determines whether a path starts with an absolute path component (i.e. `/`, `c:/`, `file://`, etc.).
-     *
-     * ```ts
-     * // POSIX
-     * pathIsAbsolute("/path/to/file.ext") === true
-     * // DOS
-     * pathIsAbsolute("c:/path/to/file.ext") === true
-     * // URL
-     * pathIsAbsolute("file:///path/to/file.ext") === true
-     * // Non-absolute
-     * pathIsAbsolute("path/to/file.ext") === false
-     * pathIsAbsolute("./path/to/file.ext") === false
-     * ```
-     */
-    function pathIsAbsolute(path) {
-        return getEncodedRootLength(path) !== 0;
-    }
-    ts.pathIsAbsolute = pathIsAbsolute;
-    /**
-     * Determines whether a path starts with a relative path component (i.e. `.` or `..`).
-     */
-    function pathIsRelative(path) {
-        return /^\.\.?($|[\\/])/.test(path);
-    }
-    ts.pathIsRelative = pathIsRelative;
-    function hasExtension(fileName) {
-        return ts.stringContains(getBaseFileName(fileName), ".");
-    }
-    ts.hasExtension = hasExtension;
-    function fileExtensionIs(path, extension) {
-        return path.length > extension.length && ts.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;
-    /**
-     * Determines whether a path has a trailing separator (`/` or `\\`).
-     */
-    function hasTrailingDirectorySeparator(path) {
-        return path.length > 0 && isAnyDirectorySeparator(path.charCodeAt(path.length - 1));
-    }
-    ts.hasTrailingDirectorySeparator = hasTrailingDirectorySeparator;
-    //// Path Parsing
-    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;
-    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 = removeTrailingDirectorySeparator(path);
-        return path.slice(0, Math.max(rootLength, path.lastIndexOf(ts.directorySeparator)));
-    }
-    ts.getDirectoryPath = getDirectoryPath;
-    function getBaseFileName(path, extensions, ignoreCase) {
-        path = normalizeSlashes(path);
-        // if the path provided is itself the root, then it has not file name.
-        var rootLength = 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(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;
-    function tryGetExtensionFromPath(path, extension, stringEqualityComparer) {
-        if (!ts.startsWith(extension, "."))
-            extension = "." + extension;
-        if (path.length >= extension.length && path.charCodeAt(path.length - extension.length) === 46 /* dot */) {
-            var pathExtension = path.slice(path.length - extension.length);
-            if (stringEqualityComparer(pathExtension, extension)) {
-                return pathExtension;
-            }
-        }
-    }
-    function getAnyExtensionFromPathWorker(path, extensions, stringEqualityComparer) {
-        if (typeof extensions === "string") {
-            return tryGetExtensionFromPath(path, extensions, stringEqualityComparer) || "";
-        }
-        for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
-            var extension = extensions_2[_i];
-            var result = tryGetExtensionFromPath(path, extension, stringEqualityComparer);
-            if (result)
-                return result;
-        }
-        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(removeTrailingDirectorySeparator(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 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 __spreadArrays([root], 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 (`/`).
-     *
-     * ```ts
-     * // POSIX
-     * getPathComponents("/path/to/file.ext") === ["/", "path", "to", "file.ext"]
-     * getPathComponents("/path/to/") === ["/", "path", "to"]
-     * getPathComponents("/") === ["/"]
-     * // DOS
-     * getPathComponents("c:/path/to/file.ext") === ["c:/", "path", "to", "file.ext"]
-     * getPathComponents("c:/path/to/") === ["c:/", "path", "to"]
-     * getPathComponents("c:/") === ["c:/"]
-     * getPathComponents("c:") === ["c:"]
-     * // URL
-     * getPathComponents("http://typescriptlang.org/path/to/file.ext") === ["http://typescriptlang.org/", "path", "to", "file.ext"]
-     * getPathComponents("http://typescriptlang.org/path/to/") === ["http://typescriptlang.org/", "path", "to"]
-     * getPathComponents("http://typescriptlang.org/") === ["http://typescriptlang.org/"]
-     * getPathComponents("http://typescriptlang.org") === ["http://typescriptlang.org"]
-     * getPathComponents("file://server/path/to/file.ext") === ["file://server/", "path", "to", "file.ext"]
-     * getPathComponents("file://server/path/to/") === ["file://server/", "path", "to"]
-     * getPathComponents("file://server/") === ["file://server/"]
-     * getPathComponents("file://server") === ["file://server"]
-     * getPathComponents("file:///path/to/file.ext") === ["file:///", "path", "to", "file.ext"]
-     * getPathComponents("file:///path/to/") === ["file:///", "path", "to"]
-     * getPathComponents("file:///") === ["file:///"]
-     * getPathComponents("file://") === ["file://"]
-     */
-    function getPathComponents(path, currentDirectory) {
-        if (currentDirectory === void 0) { currentDirectory = ""; }
-        path = combinePaths(currentDirectory, path);
-        return pathComponents(path, getRootLength(path));
-    }
-    ts.getPathComponents = getPathComponents;
-    //// Path Formatting
-    /**
-     * Formats a parsed path consisting of a root component (at index 0) and zero or more path
-     * segments (at indices > 0).
-     *
-     * ```ts
-     * getPathFromPathComponents(["/", "path", "to", "file.ext"]) === "/path/to/file.ext"
-     * ```
-     */
-    function getPathFromPathComponents(pathComponents) {
-        if (pathComponents.length === 0)
-            return "";
-        var root = pathComponents[0] && ensureTrailingDirectorySeparator(pathComponents[0]);
-        return root + pathComponents.slice(1).join(ts.directorySeparator);
-    }
-    ts.getPathFromPathComponents = getPathFromPathComponents;
-    //// Path Normalization
-    /**
-     * Normalize path separators, converting `\` into `/`.
-     */
-    function normalizeSlashes(path) {
-        return path.replace(backslashRegExp, ts.directorySeparator);
-    }
-    ts.normalizeSlashes = normalizeSlashes;
-    /**
-     * 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;
-    /**
-     * Combines paths. If a path is absolute, it replaces any previous path. Relative paths are not simplified.
-     *
-     * ```ts
-     * // Non-rooted
-     * combinePaths("path", "to", "file.ext") === "path/to/file.ext"
-     * combinePaths("path", "dir", "..", "to", "file.ext") === "path/dir/../to/file.ext"
-     * // POSIX
-     * combinePaths("/path", "to", "file.ext") === "/path/to/file.ext"
-     * combinePaths("/path", "/to", "file.ext") === "/to/file.ext"
-     * // DOS
-     * combinePaths("c:/path", "to", "file.ext") === "c:/path/to/file.ext"
-     * combinePaths("c:/path", "c:/to", "file.ext") === "c:/to/file.ext"
-     * // URL
-     * combinePaths("file:///path", "to", "file.ext") === "file:///path/to/file.ext"
-     * combinePaths("file:///path", "file:///to", "file.ext") === "file:///to/file.ext"
-     * ```
-     */
-    function combinePaths(path) {
-        var paths = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            paths[_i - 1] = arguments[_i];
-        }
-        if (path)
-            path = normalizeSlashes(path);
-        for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
-            var relativePath = paths_1[_a];
-            if (!relativePath)
-                continue;
-            relativePath = normalizeSlashes(relativePath);
-            if (!path || 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. Trailing directory separators are preserved.
-     *
-     * ```ts
-     * resolvePath("/path", "to", "file.ext") === "path/to/file.ext"
-     * resolvePath("/path", "to", "file.ext/") === "path/to/file.ext/"
-     * resolvePath("/path", "dir", "..", "to", "file.ext") === "path/to/file.ext"
-     * ```
-     */
-    function resolvePath(path) {
-        var paths = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            paths[_i - 1] = arguments[_i];
-        }
-        return normalizePath(ts.some(paths) ? combinePaths.apply(void 0, __spreadArrays([path], paths)) : normalizeSlashes(path));
-    }
-    ts.resolvePath = resolvePath;
-    /**
-     * 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 (`/`).
-     *
-     * ```ts
-     * getNormalizedPathComponents("to/dir/../file.ext", "/path/") === ["/", "path", "to", "file.ext"]
-     * ```
-     */
-    function getNormalizedPathComponents(path, currentDirectory) {
-        return reducePathComponents(getPathComponents(path, currentDirectory));
-    }
-    ts.getNormalizedPathComponents = getNormalizedPathComponents;
-    function getNormalizedAbsolutePath(fileName, currentDirectory) {
-        return getPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
-    }
-    ts.getNormalizedAbsolutePath = getNormalizedAbsolutePath;
-    function normalizePath(path) {
-        path = normalizeSlashes(path);
-        var normalized = getPathFromPathComponents(reducePathComponents(getPathComponents(path)));
-        return normalized && hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(normalized) : normalized;
-    }
-    ts.normalizePath = normalizePath;
-    function getPathWithoutRoot(pathComponents) {
-        if (pathComponents.length === 0)
-            return "";
-        return pathComponents.slice(1).join(ts.directorySeparator);
-    }
-    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
-        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
-    }
-    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
-    function toPath(fileName, basePath, getCanonicalFileName) {
-        var nonCanonicalizedPath = isRootedDiskPath(fileName)
-            ? normalizePath(fileName)
-            : getNormalizedAbsolutePath(fileName, basePath);
-        return getCanonicalFileName(nonCanonicalizedPath);
-    }
-    ts.toPath = toPath;
-    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: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
-        }
-        else {
-            return { path: root, parts: parts };
-        }
-    }
-    ts.normalizePathAndParts = normalizePathAndParts;
-    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;
-    /**
-     * 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.
-     *
-     * ```ts
-     * ensurePathIsNonModuleName("/path/to/file.ext") === "/path/to/file.ext"
-     * ensurePathIsNonModuleName("./path/to/file.ext") === "./path/to/file.ext"
-     * ensurePathIsNonModuleName("../path/to/file.ext") === "../path/to/file.ext"
-     * ensurePathIsNonModuleName("path/to/file.ext") === "./path/to/file.ext"
-     * ```
-     */
-    function ensurePathIsNonModuleName(path) {
-        return !pathIsAbsolute(path) && !pathIsRelative(path) ? "./" + path : path;
-    }
-    ts.ensurePathIsNonModuleName = ensurePathIsNonModuleName;
-    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;
-    //// Path Comparisons
-    // 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, getRootLength(a));
-        var bRoot = b.substring(0, 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 = reducePathComponents(getPathComponents(a));
-        var bComponents = reducePathComponents(getPathComponents(b));
-        var sharedLength = Math.min(aComponents.length, bComponents.length);
-        for (var i = 1; i < sharedLength; i++) {
-            var result_2 = componentComparer(aComponents[i], bComponents[i]);
-            if (result_2 !== 0 /* EqualTo */) {
-                return result_2;
-            }
-        }
-        return ts.compareValues(aComponents.length, bComponents.length);
-    }
-    /**
-     * Performs a case-sensitive comparison of two paths. Path roots are always compared case-insensitively.
-     */
-    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 = reducePathComponents(getPathComponents(parent));
-        var childComponents = reducePathComponents(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;
-    /**
-     * Determines whether `fileName` starts with the specified `directoryName` using the provided path canonicalization callback.
-     * Comparison is case-sensitive between the canonical paths.
-     *
-     * @deprecated Use `containsPath` if possible.
-     */
-    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;
-    //// Relative Paths
-    function getPathComponentsRelativeTo(from, to, stringEqualityComparer, getCanonicalFileName) {
-        var fromComponents = reducePathComponents(getPathComponents(from));
-        var toComponents = reducePathComponents(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 __spreadArrays([""], relative, components);
-    }
-    ts.getPathComponentsRelativeTo = getPathComponentsRelativeTo;
-    function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        ts.Debug.assert((getRootLength(fromDirectory) > 0) === (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 getPathFromPathComponents(pathComponents);
-    }
-    ts.getRelativePathFromDirectory = getRelativePathFromDirectory;
-    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
-        return !isRootedDiskPath(absoluteOrRelativePath)
-            ? absoluteOrRelativePath
-            : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
-    }
-    ts.convertToRelativePath = convertToRelativePath;
-    function getRelativePathFromFile(from, to, getCanonicalFileName) {
-        return ensurePathIsNonModuleName(getRelativePathFromDirectory(getDirectoryPath(from), to, getCanonicalFileName));
-    }
-    ts.getRelativePathFromFile = getRelativePathFromFile;
-    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 && isRootedDiskPath(firstComponent)) {
-            var prefix = firstComponent.charAt(0) === ts.directorySeparator ? "file://" : "file:///";
-            pathComponents[0] = prefix + firstComponent;
-        }
-        return getPathFromPathComponents(pathComponents);
-    }
-    ts.getRelativePathToDirectoryOrUrl = getRelativePathToDirectoryOrUrl;
-    function forEachAncestorDirectory(directory, callback) {
-        while (true) {
-            var result = callback(directory);
-            if (result !== undefined) {
-                return result;
-            }
-            var parentPath = getDirectoryPath(directory);
-            if (parentPath === directory) {
-                return undefined;
-            }
-            directory = parentPath;
-        }
-    }
-    ts.forEachAncestorDirectory = forEachAncestorDirectory;
-    function isNodeModulesDirectory(dirPath) {
-        return ts.endsWith(dirPath, "/node_modules");
-    }
-    ts.isNodeModulesDirectory = isNodeModulesDirectory;
-})(ts || (ts = {}));
 // <auto-generated />
 // generated from './diagnosticInformationMap.generated.ts' by 'src/compiler'
 /* @internal */
@@ -7155,7 +7719,7 @@ var ts;
         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."),
+        _0_modifier_cannot_appear_on_class_elements_of_this_kind: diag(1031, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_class_elements_of_this_kind_1031", "'{0}' modifier cannot appear on class elements of this kind."),
         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."),
@@ -7295,7 +7859,7 @@ var ts;
         Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type: diag(1205, ts.DiagnosticCategory.Error, "Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type_1205", "Re-exporting a type when the '--isolatedModules' flag is provided requires using 'export type'."),
         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."),
-        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."),
+        _0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module: diag(1208, ts.DiagnosticCategory.Error, "_0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_imp_1208", "'{0}' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module."),
         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."),
@@ -7343,11 +7907,12 @@ 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"),
         Keywords_cannot_contain_escape_characters: diag(1260, ts.DiagnosticCategory.Error, "Keywords_cannot_contain_escape_characters_1260", "Keywords cannot contain escape characters."),
         Already_included_file_name_0_differs_from_file_name_1_only_in_casing: diag(1261, ts.DiagnosticCategory.Error, "Already_included_file_name_0_differs_from_file_name_1_only_in_casing_1261", "Already included file name '{0}' differs from file name '{1}' only in casing."),
         Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module: diag(1262, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module_1262", "Identifier expected. '{0}' is a reserved word at the top-level of a module."),
+        Declarations_with_initializers_cannot_also_have_definite_assignment_assertions: diag(1263, ts.DiagnosticCategory.Error, "Declarations_with_initializers_cannot_also_have_definite_assignment_assertions_1263", "Declarations with initializers cannot also have definite assignment assertions."),
+        Declarations_with_definite_assignment_assertions_must_also_have_type_annotations: diag(1264, ts.DiagnosticCategory.Error, "Declarations_with_definite_assignment_assertions_must_also_have_type_annotations_1264", "Declarations with definite assignment assertions must also have type annotations."),
         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_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
         Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."),
@@ -7364,7 +7929,7 @@ var ts;
         Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_esnext_commonjs_amd_system_or_umd: diag(1323, ts.DiagnosticCategory.Error, "Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_esnext_commonjs_amd_system__1323", "Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'."),
         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"),
+        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}()'?"),
@@ -7380,9 +7945,9 @@ var ts;
         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_when_the_module_option_is_esnext_or_system: diag(1343, ts.DiagnosticCategory.Error, "The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_esnext_or_system_1343", "The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'."),
+        The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_esnext_or_system: diag(1343, ts.DiagnosticCategory.Error, "The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_esnext_or_system_1343", "The 'import.meta' meta-property is only allowed when the '--module' option is 'es2020', 'esnext', or 'system'."),
         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"),
+        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."),
@@ -7425,6 +7990,7 @@ var ts;
         Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1388, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388", "Constructor type notation must be parenthesized when used in an intersection type."),
+        _0_is_not_allowed_as_a_variable_declaration_name: diag(1389, ts.DiagnosticCategory.Error, "_0_is_not_allowed_as_a_variable_declaration_name_1389", "'{0}' is not allowed as a variable declaration name."),
         The_types_of_0_are_incompatible_between_these_types: diag(2200, ts.DiagnosticCategory.Error, "The_types_of_0_are_incompatible_between_these_types_2200", "The types of '{0}' are incompatible between these types."),
         The_types_returned_by_0_are_incompatible_between_these_types: diag(2201, ts.DiagnosticCategory.Error, "The_types_returned_by_0_are_incompatible_between_these_types_2201", "The types returned by '{0}' are incompatible between these types."),
         Call_signature_return_types_0_and_1_are_incompatible: diag(2202, ts.DiagnosticCategory.Error, "Call_signature_return_types_0_and_1_are_incompatible_2202", "Call signature return types '{0}' and '{1}' are incompatible.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ true),
@@ -7550,6 +8116,7 @@ var ts;
         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}'."),
+        Types_of_construct_signatures_are_incompatible: diag(2419, ts.DiagnosticCategory.Error, "Types_of_construct_signatures_are_incompatible_2419", "Types of construct signatures are incompatible."),
         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."),
@@ -7673,6 +8240,7 @@ var ts;
         The_type_returned_by_the_0_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_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' 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_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2_or_later: diag(2550, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Do_you_need_to_change_your_target_library_Try_changing_the_lib_c_2550", "Property '{0}' does not exist on type '{1}'. Do you need to change your target library? Try changing the `lib` compiler option to '{2}' or later."),
         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."),
@@ -7696,13 +8264,13 @@ var ts;
         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}'"),
+        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."),
         Unused_ts_expect_error_directive: diag(2578, ts.DiagnosticCategory.Error, "Unused_ts_expect_error_directive_2578", "Unused '@ts-expect-error' directive."),
-        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_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode: diag(2580, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashno_2580", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slashjquery: diag(2581, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slash_2581", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery`."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_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_save_dev_type_2582", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @types/mocha`."),
+        Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_1_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 '{1}' 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."),
@@ -7710,9 +8278,9 @@ var ts;
         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."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_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_save_dev_types_Slashno_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @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_save_dev_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_save_dev_types_Slash_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @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_save_dev_types_Slashjest_or_npm_i_save_dev_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_save_dev_type_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @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."),
         _0_can_only_be_imported_by_using_a_default_import: diag(2595, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_default_import_2595", "'{0}' can only be imported by using a default import."),
         _0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2596, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import_2596", "'{0}' can only be imported by turning on the 'esModuleInterop' flag and using a default import."),
@@ -7780,6 +8348,7 @@ var ts;
         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'?"),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0: diag(2690, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0_2690", "'{0}' only refers to a type, but is being used as a value here. Did you mean to use '{1} in {0}'?"),
         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."),
@@ -7813,7 +8382,7 @@ var ts;
         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}'?"),
+        _0_has_no_exported_member_named_1_Did_you_mean_2: diag(2724, ts.DiagnosticCategory.Error, "_0_has_no_exported_member_named_1_Did_you_mean_2_2724", "'{0}' has no exported member named '{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}'?"),
@@ -7821,7 +8390,7 @@ var ts;
         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"),
+        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."),
         Are_you_missing_a_semicolon: diag(2734, ts.DiagnosticCategory.Error, "Are_you_missing_a_semicolon_2734", "Are you 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}'?"),
@@ -7882,6 +8451,10 @@ var ts;
         The_operand_of_a_delete_operator_must_be_optional: diag(2790, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_must_be_optional_2790", "The operand of a 'delete' operator must be optional."),
         Exponentiation_cannot_be_performed_on_bigint_values_unless_the_target_option_is_set_to_es2016_or_later: diag(2791, ts.DiagnosticCategory.Error, "Exponentiation_cannot_be_performed_on_bigint_values_unless_the_target_option_is_set_to_es2016_or_lat_2791", "Exponentiation cannot be performed on 'bigint' values unless the 'target' option is set to 'es2016' or later."),
         Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option: diag(2792, ts.DiagnosticCategory.Error, "Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_th_2792", "Cannot find module '{0}'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?"),
+        The_call_would_have_succeeded_against_this_implementation_but_implementation_signatures_of_overloads_are_not_externally_visible: diag(2793, ts.DiagnosticCategory.Error, "The_call_would_have_succeeded_against_this_implementation_but_implementation_signatures_of_overloads_2793", "The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible."),
+        Expected_0_arguments_but_got_1_Did_you_forget_to_include_void_in_your_type_argument_to_Promise: diag(2794, ts.DiagnosticCategory.Error, "Expected_0_arguments_but_got_1_Did_you_forget_to_include_void_in_your_type_argument_to_Promise_2794", "Expected {0} arguments, but got {1}. Did you forget to include 'void' in your type argument to 'Promise'?"),
+        The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types: diag(2795, ts.DiagnosticCategory.Error, "The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types_2795", "The 'intrinsic' keyword can only be used to declare compiler provided intrinsic types."),
+        It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tagged_template_expression_which_cannot_be_invoked: diag(2796, ts.DiagnosticCategory.Error, "It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tag_2796", "It is likely that you are missing a comma to separate these two template expressions. They form a tagged template expression which cannot be invoked."),
         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}'."),
@@ -7995,7 +8568,6 @@ var ts;
         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_can_have_at_most_one_Asterisk_character: diag(5062, ts.DiagnosticCategory.Error, "Substitution_0_in_pattern_1_can_have_at_most_one_Asterisk_character_5062", "Substitution '{0}' in pattern '{1}' 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."),
@@ -8024,6 +8596,8 @@ var ts;
         A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type: diag(5086, ts.DiagnosticCategory.Error, "A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_c_5086", "A labeled tuple element is declared as optional with a question mark after the name and before the colon, rather than after the type."),
         A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type: diag(5087, ts.DiagnosticCategory.Error, "A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type_5087", "A labeled tuple element is declared as rest with a `...` before the name, rather than before the type."),
         The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialized_A_type_annotation_is_necessary: diag(5088, ts.DiagnosticCategory.Error, "The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialize_5088", "The inferred type of '{0}' references a type with a cyclic structure which cannot be trivially serialized. A type annotation is necessary."),
+        Option_0_cannot_be_specified_when_option_jsx_is_1: diag(5089, ts.DiagnosticCategory.Error, "Option_0_cannot_be_specified_when_option_jsx_is_1_5089", "Option '{0}' cannot be specified when option 'jsx' is '{1}'."),
+        Non_relative_paths_are_not_allowed_when_baseUrl_is_not_set_Did_you_forget_a_leading_Slash: diag(5090, ts.DiagnosticCategory.Error, "Non_relative_paths_are_not_allowed_when_baseUrl_is_not_set_Did_you_forget_a_leading_Slash_5090", "Non-relative paths are not allowed when 'baseUrl' is not set. Did you forget a leading './'?"),
         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."),
@@ -8214,7 +8788,7 @@ var ts;
         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}"),
         _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"),
+        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}'."),
@@ -8246,6 +8820,8 @@ var ts;
         This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without: diag(6234, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without_6234", "This expression is not callable because it is a 'get' accessor. Did you mean to use it without '()'?"),
         Disable_loading_referenced_projects: diag(6235, ts.DiagnosticCategory.Message, "Disable_loading_referenced_projects_6235", "Disable loading referenced projects."),
         Arguments_for_the_rest_parameter_0_were_not_provided: diag(6236, ts.DiagnosticCategory.Error, "Arguments_for_the_rest_parameter_0_were_not_provided_6236", "Arguments for the rest parameter '{0}' were not provided."),
+        Generates_an_event_trace_and_a_list_of_types: diag(6237, ts.DiagnosticCategory.Message, "Generates_an_event_trace_and_a_list_of_types_6237", "Generates an event trace and a list of types."),
+        Specify_the_module_specifier_to_be_used_to_import_the_jsx_and_jsxs_factory_functions_from_eg_react: diag(6238, ts.DiagnosticCategory.Error, "Specify_the_module_specifier_to_be_used_to_import_the_jsx_and_jsxs_factory_functions_from_eg_react_6238", "Specify the module specifier to be used to import the `jsx` and `jsxs` factory functions from. eg, react"),
         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"),
         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."),
@@ -8291,11 +8867,13 @@ var ts;
         Project_0_can_t_be_built_because_its_dependency_1_was_not_built: diag(6383, ts.DiagnosticCategory.Message, "Project_0_can_t_be_built_because_its_dependency_1_was_not_built_6383", "Project '{0}' can't be built because its dependency '{1}' was not built"),
         Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it: diag(6384, ts.DiagnosticCategory.Message, "Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_di_6384", "Have recompiles in '--incremental' and '--watch' assume that changes within a file will only affect files directly depending on it."),
         _0_is_deprecated: diag(6385, ts.DiagnosticCategory.Suggestion, "_0_is_deprecated_6385", "'{0}' is deprecated", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined, /*reportsDeprecated*/ true),
+        Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found: diag(6386, ts.DiagnosticCategory.Message, "Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386", "Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found."),
         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."),
         Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing: diag(6503, ts.DiagnosticCategory.Message, "Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing_6503", "Print names of files that are part of the compilation and then stop processing."),
         File_0_is_a_JavaScript_file_Did_you_mean_to_enable_the_allowJs_option: diag(6504, ts.DiagnosticCategory.Error, "File_0_is_a_JavaScript_file_Did_you_mean_to_enable_the_allowJs_option_6504", "File '{0}' is a JavaScript file. Did you mean to enable the 'allowJs' option?"),
+        Include_undefined_in_index_signature_results: diag(6800, ts.DiagnosticCategory.Message, "Include_undefined_in_index_signature_results_6800", "Include 'undefined' in index signature results"),
         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."),
@@ -8323,7 +8901,7 @@ var ts;
         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}';`"),
+        Try_npm_i_save_dev_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_i_save_dev_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare__7035", "Try `npm i --save-dev @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."),
@@ -8344,6 +8922,7 @@ var ts;
         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}'."),
         _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
+        The_inferred_type_of_this_node_exceeds_the_maximum_length_the_compiler_will_serialize_An_explicit_type_annotation_is_needed: diag(7056, ts.DiagnosticCategory.Error, "The_inferred_type_of_this_node_exceeds_the_maximum_length_the_compiler_will_serialize_An_explicit_ty_7056", "The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed."),
         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_TypeScript_files: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_TypeScript_files_8002", "'import ... =' can only be used in TypeScript files."),
@@ -8454,6 +9033,7 @@ var ts;
         Declare_a_private_field_named_0: diag(90053, ts.DiagnosticCategory.Message, "Declare_a_private_field_named_0_90053", "Declare a private field named '{0}'."),
         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"),
+        Convert_0_to_1_in_0: diag(95003, ts.DiagnosticCategory.Message, "Convert_0_to_1_in_0_95003", "Convert '{0}' to '{1} in {0}'"),
         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"),
@@ -8471,6 +9051,7 @@ var ts;
         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}'"),
+        Convert_all_type_literals_to_mapped_type: diag(95021, ts.DiagnosticCategory.Message, "Convert_all_type_literals_to_mapped_type_95021", "Convert all type literals to mapped type"),
         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"),
@@ -8592,10 +9173,12 @@ var ts;
         Could_not_find_convertible_access_expression: diag(95140, ts.DiagnosticCategory.Message, "Could_not_find_convertible_access_expression_95140", "Could not find convertible access expression"),
         Could_not_find_matching_access_expressions: diag(95141, ts.DiagnosticCategory.Message, "Could_not_find_matching_access_expressions_95141", "Could not find matching access expressions"),
         Can_only_convert_logical_AND_access_chains: diag(95142, ts.DiagnosticCategory.Message, "Can_only_convert_logical_AND_access_chains_95142", "Can only convert logical AND access chains"),
+        Add_void_to_Promise_resolved_without_a_value: diag(95143, ts.DiagnosticCategory.Message, "Add_void_to_Promise_resolved_without_a_value_95143", "Add 'void' to Promise resolved without a value"),
+        Add_void_to_all_Promises_resolved_without_a_value: diag(95144, ts.DiagnosticCategory.Message, "Add_void_to_all_Promises_resolved_without_a_value_95144", "Add 'void' to all Promises resolved without a value"),
         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."),
         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'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
-        Private_identifiers_cannot_be_used_as_parameters: diag(18009, ts.DiagnosticCategory.Error, "Private_identifiers_cannot_be_used_as_parameters_18009", "Private identifiers cannot be used as parameters"),
+        Private_identifiers_cannot_be_used_as_parameters: diag(18009, ts.DiagnosticCategory.Error, "Private_identifiers_cannot_be_used_as_parameters_18009", "Private identifiers cannot be used as parameters."),
         An_accessibility_modifier_cannot_be_used_with_a_private_identifier: diag(18010, ts.DiagnosticCategory.Error, "An_accessibility_modifier_cannot_be_used_with_a_private_identifier_18010", "An accessibility modifier cannot be used with a private identifier."),
         The_operand_of_a_delete_operator_cannot_be_a_private_identifier: diag(18011, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_cannot_be_a_private_identifier_18011", "The operand of a 'delete' operator cannot be a private identifier."),
         constructor_is_a_reserved_word: diag(18012, ts.DiagnosticCategory.Error, "constructor_is_a_reserved_word_18012", "'#constructor' is a reserved word."),
@@ -8605,7 +9188,7 @@ var ts;
         Private_identifiers_are_not_allowed_outside_class_bodies: diag(18016, ts.DiagnosticCategory.Error, "Private_identifiers_are_not_allowed_outside_class_bodies_18016", "Private identifiers are not allowed outside class bodies."),
         The_shadowing_declaration_of_0_is_defined_here: diag(18017, ts.DiagnosticCategory.Error, "The_shadowing_declaration_of_0_is_defined_here_18017", "The shadowing declaration of '{0}' is defined here"),
         The_declaration_of_0_that_you_probably_intended_to_use_is_defined_here: diag(18018, ts.DiagnosticCategory.Error, "The_declaration_of_0_that_you_probably_intended_to_use_is_defined_here_18018", "The declaration of '{0}' that you probably intended to use is defined here"),
-        _0_modifier_cannot_be_used_with_a_private_identifier: diag(18019, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_with_a_private_identifier_18019", "'{0}' modifier cannot be used with a private identifier"),
+        _0_modifier_cannot_be_used_with_a_private_identifier: diag(18019, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_with_a_private_identifier_18019", "'{0}' modifier cannot be used with a private identifier."),
         A_method_cannot_be_named_with_a_private_identifier: diag(18022, ts.DiagnosticCategory.Error, "A_method_cannot_be_named_with_a_private_identifier_18022", "A method cannot be named with a private identifier."),
         An_accessor_cannot_be_named_with_a_private_identifier: diag(18023, ts.DiagnosticCategory.Error, "An_accessor_cannot_be_named_with_a_private_identifier_18023", "An accessor cannot be named with a private identifier."),
         An_enum_member_cannot_be_named_with_a_private_identifier: diag(18024, ts.DiagnosticCategory.Error, "An_enum_member_cannot_be_named_with_a_private_identifier_18024", "An enum member cannot be named with a private identifier."),
@@ -8639,7 +9222,7 @@ var ts;
             any: 128 /* AnyKeyword */,
             as: 126 /* AsKeyword */,
             asserts: 127 /* AssertsKeyword */,
-            bigint: 154 /* BigIntKeyword */,
+            bigint: 155 /* BigIntKeyword */,
             boolean: 131 /* BooleanKeyword */,
             break: 80 /* BreakKeyword */,
             case: 81 /* CaseKeyword */,
@@ -8661,7 +9244,7 @@ var ts;
         _a.false = 94 /* FalseKeyword */,
         _a.finally = 95 /* FinallyKeyword */,
         _a.for = 96 /* ForKeyword */,
-        _a.from = 152 /* FromKeyword */,
+        _a.from = 153 /* FromKeyword */,
         _a.function = 97 /* FunctionKeyword */,
         _a.get = 134 /* GetKeyword */,
         _a.if = 98 /* IfKeyword */,
@@ -8671,39 +9254,40 @@ var ts;
         _a.infer = 135 /* InferKeyword */,
         _a.instanceof = 101 /* InstanceOfKeyword */,
         _a.interface = 117 /* InterfaceKeyword */,
-        _a.is = 136 /* IsKeyword */,
-        _a.keyof = 137 /* KeyOfKeyword */,
+        _a.intrinsic = 136 /* IntrinsicKeyword */,
+        _a.is = 137 /* IsKeyword */,
+        _a.keyof = 138 /* KeyOfKeyword */,
         _a.let = 118 /* LetKeyword */,
-        _a.module = 138 /* ModuleKeyword */,
-        _a.namespace = 139 /* NamespaceKeyword */,
-        _a.never = 140 /* NeverKeyword */,
+        _a.module = 139 /* ModuleKeyword */,
+        _a.namespace = 140 /* NamespaceKeyword */,
+        _a.never = 141 /* NeverKeyword */,
         _a.new = 102 /* NewKeyword */,
         _a.null = 103 /* NullKeyword */,
-        _a.number = 143 /* NumberKeyword */,
-        _a.object = 144 /* ObjectKeyword */,
+        _a.number = 144 /* NumberKeyword */,
+        _a.object = 145 /* ObjectKeyword */,
         _a.package = 119 /* PackageKeyword */,
         _a.private = 120 /* PrivateKeyword */,
         _a.protected = 121 /* ProtectedKeyword */,
         _a.public = 122 /* PublicKeyword */,
-        _a.readonly = 141 /* ReadonlyKeyword */,
-        _a.require = 142 /* RequireKeyword */,
-        _a.global = 153 /* GlobalKeyword */,
+        _a.readonly = 142 /* ReadonlyKeyword */,
+        _a.require = 143 /* RequireKeyword */,
+        _a.global = 154 /* GlobalKeyword */,
         _a.return = 104 /* ReturnKeyword */,
-        _a.set = 145 /* SetKeyword */,
+        _a.set = 146 /* SetKeyword */,
         _a.static = 123 /* StaticKeyword */,
-        _a.string = 146 /* StringKeyword */,
+        _a.string = 147 /* StringKeyword */,
         _a.super = 105 /* SuperKeyword */,
         _a.switch = 106 /* SwitchKeyword */,
-        _a.symbol = 147 /* SymbolKeyword */,
+        _a.symbol = 148 /* SymbolKeyword */,
         _a.this = 107 /* ThisKeyword */,
         _a.throw = 108 /* ThrowKeyword */,
         _a.true = 109 /* TrueKeyword */,
         _a.try = 110 /* TryKeyword */,
-        _a.type = 148 /* TypeKeyword */,
+        _a.type = 149 /* TypeKeyword */,
         _a.typeof = 111 /* TypeOfKeyword */,
-        _a.undefined = 149 /* UndefinedKeyword */,
-        _a.unique = 150 /* UniqueKeyword */,
-        _a.unknown = 151 /* UnknownKeyword */,
+        _a.undefined = 150 /* UndefinedKeyword */,
+        _a.unique = 151 /* UniqueKeyword */,
+        _a.unknown = 152 /* UnknownKeyword */,
         _a.var = 112 /* VarKeyword */,
         _a.void = 113 /* VoidKeyword */,
         _a.while = 114 /* WhileKeyword */,
@@ -8711,7 +9295,7 @@ var ts;
         _a.yield = 124 /* YieldKeyword */,
         _a.async = 129 /* AsyncKeyword */,
         _a.await = 130 /* AwaitKeyword */,
-        _a.of = 155 /* OfKeyword */,
+        _a.of = 156 /* OfKeyword */,
         _a);
     var textToKeyword = new ts.Map(ts.getEntries(textToKeywordObj));
     var textToToken = new ts.Map(ts.getEntries(__assign(__assign({}, textToKeywordObj), { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 29 /* LessThanToken */, ">": 31 /* GreaterThanToken */, "<=": 32 /* LessThanEqualsToken */, ">=": 33 /* GreaterThanEqualsToken */, "==": 34 /* EqualsEqualsToken */, "!=": 35 /* ExclamationEqualsToken */, "===": 36 /* EqualsEqualsEqualsToken */, "!==": 37 /* ExclamationEqualsEqualsToken */, "=>": 38 /* EqualsGreaterThanToken */, "+": 39 /* PlusToken */, "-": 40 /* MinusToken */, "**": 42 /* AsteriskAsteriskToken */, "*": 41 /* AsteriskToken */, "/": 43 /* SlashToken */, "%": 44 /* PercentToken */, "++": 45 /* PlusPlusToken */, "--": 46 /* MinusMinusToken */, "<<": 47 /* LessThanLessThanToken */, "</": 30 /* LessThanSlashToken */, ">>": 48 /* GreaterThanGreaterThanToken */, ">>>": 49 /* GreaterThanGreaterThanGreaterThanToken */, "&": 50 /* AmpersandToken */, "|": 51 /* BarToken */, "^": 52 /* CaretToken */, "!": 53 /* ExclamationToken */, "~": 54 /* TildeToken */, "&&": 55 /* AmpersandAmpersandToken */, "||": 56 /* BarBarToken */, "?": 57 /* QuestionToken */, "??": 60 /* QuestionQuestionToken */, "?.": 28 /* QuestionDotToken */, ":": 58 /* ColonToken */, "=": 62 /* EqualsToken */, "+=": 63 /* PlusEqualsToken */, "-=": 64 /* MinusEqualsToken */, "*=": 65 /* AsteriskEqualsToken */, "**=": 66 /* AsteriskAsteriskEqualsToken */, "/=": 67 /* SlashEqualsToken */, "%=": 68 /* PercentEqualsToken */, "<<=": 69 /* LessThanLessThanEqualsToken */, ">>=": 70 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 72 /* AmpersandEqualsToken */, "|=": 73 /* BarEqualsToken */, "^=": 77 /* CaretEqualsToken */, "||=": 74 /* BarBarEqualsToken */, "&&=": 75 /* AmpersandAmpersandEqualsToken */, "??=": 76 /* QuestionQuestionEqualsToken */, "@": 59 /* AtToken */, "`": 61 /* BacktickToken */ })));
@@ -9892,9 +10476,9 @@ var ts;
             return result;
         }
         function getIdentifierToken() {
-            // Reserved words are between 2 and 11 characters long and start with a lowercase letter
+            // Reserved words are between 2 and 12 characters long and start with a lowercase letter
             var len = tokenValue.length;
-            if (len >= 2 && len <= 11) {
+            if (len >= 2 && len <= 12) {
                 var ch = tokenValue.charCodeAt(0);
                 if (ch >= 97 /* a */ && ch <= 122 /* z */) {
                     var keyword = textToKeyword.get(tokenValue);
@@ -11097,9 +11681,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 158 /* TypeParameter */) {
+        if (d && d.kind === 159 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (isFunctionLike(current) || isClassLike(current) || current.kind === 250 /* InterfaceDeclaration */) {
+                if (isFunctionLike(current) || isClassLike(current) || current.kind === 253 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -11107,7 +11691,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node, parent) {
-        return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) && parent.kind === 165 /* Constructor */;
+        return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) && parent.kind === 166 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -11137,14 +11721,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 246 /* VariableDeclaration */) {
+        if (node.kind === 249 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 247 /* VariableDeclarationList */) {
+        if (node && node.kind === 250 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 229 /* VariableStatement */) {
+        if (node && node.kind === 232 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -11235,6 +11819,20 @@ var ts;
         return !nodeTest || nodeTest(node) ? node : undefined;
     }
     ts.getOriginalNode = getOriginalNode;
+    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;
     /**
      * Gets a value indicating whether a node originated in the parse tree.
      *
@@ -11300,30 +11898,30 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 229 /* VariableStatement */:
+            case 232 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 230 /* ExpressionStatement */:
+            case 233 /* ExpressionStatement */:
                 var expr = hostNode.expression;
-                if (expr.kind === 213 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) {
+                if (expr.kind === 216 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) {
                     expr = expr.left;
                 }
                 switch (expr.kind) {
-                    case 198 /* PropertyAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 199 /* ElementAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 204 /* ParenthesizedExpression */: {
+            case 207 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 242 /* LabeledStatement */: {
+            case 245 /* LabeledStatement */: {
                 if (isDeclaration(hostNode.statement) || isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -11360,16 +11958,16 @@ var ts;
         switch (declaration.kind) {
             case 78 /* Identifier */:
                 return declaration;
-            case 328 /* JSDocPropertyTag */:
-            case 322 /* JSDocParameterTag */: {
+            case 333 /* JSDocPropertyTag */:
+            case 326 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 156 /* QualifiedName */) {
+                if (name.kind === 157 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 200 /* CallExpression */:
-            case 213 /* BinaryExpression */: {
+            case 203 /* CallExpression */:
+            case 216 /* BinaryExpression */: {
                 var expr_1 = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr_1)) {
                     case 1 /* ExportsProperty */:
@@ -11385,15 +11983,15 @@ var ts;
                         return undefined;
                 }
             }
-            case 327 /* JSDocTypedefTag */:
+            case 331 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 321 /* JSDocEnumTag */:
+            case 325 /* JSDocEnumTag */:
                 return nameForNamelessJSDocTypedef(declaration);
-            case 263 /* ExportAssignment */: {
+            case 266 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
-            case 199 /* ElementAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 var expr = declaration;
                 if (ts.isBindableStaticElementAccessExpression(expr)) {
                     return expr.argumentExpression;
@@ -11688,7 +12286,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 307 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 311 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -11720,7 +12318,7 @@ var ts;
     ts.isIdentifierOrPrivateIdentifier = isIdentifierOrPrivateIdentifier;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 167 /* SetAccessor */ || node.kind === 166 /* GetAccessor */;
+        return node.kind === 168 /* SetAccessor */ || node.kind === 167 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     function isPropertyAccessChain(node) {
@@ -11738,10 +12336,10 @@ var ts;
     function isOptionalChain(node) {
         var kind = node.kind;
         return !!(node.flags & 32 /* OptionalChain */) &&
-            (kind === 198 /* PropertyAccessExpression */
-                || kind === 199 /* ElementAccessExpression */
-                || kind === 200 /* CallExpression */
-                || kind === 222 /* NonNullExpression */);
+            (kind === 201 /* PropertyAccessExpression */
+                || kind === 202 /* ElementAccessExpression */
+                || kind === 203 /* CallExpression */
+                || kind === 225 /* NonNullExpression */);
     }
     ts.isOptionalChain = isOptionalChain;
     /* @internal */
@@ -11776,7 +12374,7 @@ var ts;
     }
     ts.isOutermostOptionalChain = isOutermostOptionalChain;
     function isNullishCoalesce(node) {
-        return node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */;
+        return node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */;
     }
     ts.isNullishCoalesce = isNullishCoalesce;
     function isConstTypeReference(node) {
@@ -11793,17 +12391,17 @@ var ts;
     }
     ts.isNonNullChain = isNonNullChain;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 238 /* BreakStatement */ || node.kind === 237 /* ContinueStatement */;
+        return node.kind === 241 /* BreakStatement */ || node.kind === 240 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isNamedExportBindings(node) {
-        return node.kind === 266 /* NamespaceExport */ || node.kind === 265 /* NamedExports */;
+        return node.kind === 269 /* NamespaceExport */ || node.kind === 268 /* NamedExports */;
     }
     ts.isNamedExportBindings = isNamedExportBindings;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 291 /* UnparsedText */:
-            case 292 /* UnparsedInternalText */:
+            case 294 /* UnparsedText */:
+            case 295 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -11812,12 +12410,12 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 289 /* UnparsedPrologue */ ||
-            node.kind === 293 /* UnparsedSyntheticReference */;
+            node.kind === 292 /* UnparsedPrologue */ ||
+            node.kind === 296 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 328 /* JSDocPropertyTag */ || node.kind === 322 /* JSDocParameterTag */;
+        return node.kind === 333 /* JSDocPropertyTag */ || node.kind === 326 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     // #endregion
@@ -11833,7 +12431,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 156 /* FirstNode */;
+        return kind >= 157 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -11842,7 +12440,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 <= 155 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 156 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -11883,12 +12481,12 @@ var ts;
     ts.isImportOrExportSpecifier = isImportOrExportSpecifier;
     function isTypeOnlyImportOrExportDeclaration(node) {
         switch (node.kind) {
-            case 262 /* ImportSpecifier */:
-            case 267 /* ExportSpecifier */:
+            case 265 /* ImportSpecifier */:
+            case 270 /* ExportSpecifier */:
                 return node.parent.parent.isTypeOnly;
-            case 260 /* NamespaceImport */:
+            case 263 /* NamespaceImport */:
                 return node.parent.isTypeOnly;
-            case 259 /* ImportClause */:
+            case 262 /* ImportClause */:
                 return node.isTypeOnly;
             default:
                 return false;
@@ -11929,7 +12527,7 @@ var ts;
             case 122 /* PublicKeyword */:
             case 120 /* PrivateKeyword */:
             case 121 /* ProtectedKeyword */:
-            case 141 /* ReadonlyKeyword */:
+            case 142 /* ReadonlyKeyword */:
             case 123 /* StaticKeyword */:
                 return true;
         }
@@ -11952,7 +12550,7 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 156 /* QualifiedName */
+        return kind === 157 /* QualifiedName */
             || kind === 78 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
@@ -11962,14 +12560,14 @@ var ts;
             || kind === 79 /* PrivateIdentifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 157 /* ComputedPropertyName */;
+            || kind === 158 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
         return kind === 78 /* Identifier */
-            || kind === 193 /* ObjectBindingPattern */
-            || kind === 194 /* ArrayBindingPattern */;
+            || kind === 196 /* ObjectBindingPattern */
+            || kind === 197 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -11984,13 +12582,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 248 /* FunctionDeclaration */:
-            case 164 /* MethodDeclaration */:
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
+            case 251 /* FunctionDeclaration */:
+            case 165 /* MethodDeclaration */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -11999,14 +12597,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 163 /* MethodSignature */:
-            case 168 /* CallSignature */:
-            case 309 /* JSDocSignature */:
-            case 169 /* ConstructSignature */:
-            case 170 /* IndexSignature */:
-            case 173 /* FunctionType */:
-            case 304 /* JSDocFunctionType */:
-            case 174 /* ConstructorType */:
+            case 164 /* MethodSignature */:
+            case 169 /* CallSignature */:
+            case 313 /* JSDocSignature */:
+            case 170 /* ConstructSignature */:
+            case 171 /* IndexSignature */:
+            case 174 /* FunctionType */:
+            case 308 /* JSDocFunctionType */:
+            case 175 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -12021,29 +12619,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 165 /* Constructor */
-            || kind === 162 /* PropertyDeclaration */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 166 /* GetAccessor */
-            || kind === 167 /* SetAccessor */
-            || kind === 170 /* IndexSignature */
-            || kind === 226 /* SemicolonClassElement */;
+        return kind === 166 /* Constructor */
+            || kind === 163 /* PropertyDeclaration */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 167 /* GetAccessor */
+            || kind === 168 /* SetAccessor */
+            || kind === 171 /* IndexSignature */
+            || kind === 229 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */);
+        return node && (node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 166 /* GetAccessor */ || node.kind === 167 /* SetAccessor */);
+        return node && (node.kind === 167 /* GetAccessor */ || node.kind === 168 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 164 /* MethodDeclaration */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
+            case 165 /* MethodDeclaration */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -12053,11 +12651,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 169 /* ConstructSignature */
-            || kind === 168 /* CallSignature */
-            || kind === 161 /* PropertySignature */
-            || kind === 163 /* MethodSignature */
-            || kind === 170 /* IndexSignature */;
+        return kind === 170 /* ConstructSignature */
+            || kind === 169 /* CallSignature */
+            || kind === 162 /* PropertySignature */
+            || kind === 164 /* MethodSignature */
+            || kind === 171 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -12066,12 +12664,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 285 /* PropertyAssignment */
-            || kind === 286 /* ShorthandPropertyAssignment */
-            || kind === 287 /* SpreadAssignment */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 166 /* GetAccessor */
-            || kind === 167 /* SetAccessor */;
+        return kind === 288 /* PropertyAssignment */
+            || kind === 289 /* ShorthandPropertyAssignment */
+            || kind === 290 /* SpreadAssignment */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 167 /* GetAccessor */
+            || kind === 168 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -12086,8 +12684,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 173 /* FunctionType */:
-            case 174 /* ConstructorType */:
+            case 174 /* FunctionType */:
+            case 175 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -12098,8 +12696,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 194 /* ArrayBindingPattern */
-                || kind === 193 /* ObjectBindingPattern */;
+            return kind === 197 /* ArrayBindingPattern */
+                || kind === 196 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -12107,15 +12705,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 196 /* ArrayLiteralExpression */
-            || kind === 197 /* ObjectLiteralExpression */;
+        return kind === 199 /* ArrayLiteralExpression */
+            || kind === 200 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 195 /* BindingElement */
-            || kind === 219 /* OmittedExpression */;
+        return kind === 198 /* BindingElement */
+            || kind === 222 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -12124,9 +12722,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 246 /* VariableDeclaration */:
-            case 159 /* Parameter */:
-            case 195 /* BindingElement */:
+            case 249 /* VariableDeclaration */:
+            case 160 /* Parameter */:
+            case 198 /* BindingElement */:
                 return true;
         }
         return false;
@@ -12147,8 +12745,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 193 /* ObjectBindingPattern */:
-            case 197 /* ObjectLiteralExpression */:
+            case 196 /* ObjectBindingPattern */:
+            case 200 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -12160,8 +12758,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 194 /* ArrayBindingPattern */:
-            case 196 /* ArrayLiteralExpression */:
+            case 197 /* ArrayBindingPattern */:
+            case 199 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -12170,26 +12768,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 198 /* PropertyAccessExpression */
-            || kind === 156 /* QualifiedName */
-            || kind === 192 /* ImportType */;
+        return kind === 201 /* PropertyAccessExpression */
+            || kind === 157 /* QualifiedName */
+            || kind === 195 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 198 /* PropertyAccessExpression */
-            || kind === 156 /* QualifiedName */;
+        return kind === 201 /* PropertyAccessExpression */
+            || kind === 157 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 272 /* JsxOpeningElement */:
-            case 271 /* JsxSelfClosingElement */:
-            case 200 /* CallExpression */:
-            case 201 /* NewExpression */:
-            case 202 /* TaggedTemplateExpression */:
-            case 160 /* Decorator */:
+            case 275 /* JsxOpeningElement */:
+            case 274 /* JsxSelfClosingElement */:
+            case 203 /* CallExpression */:
+            case 204 /* NewExpression */:
+            case 205 /* TaggedTemplateExpression */:
+            case 161 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -12197,12 +12795,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 200 /* CallExpression */ || node.kind === 201 /* NewExpression */;
+        return node.kind === 203 /* CallExpression */ || node.kind === 204 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 215 /* TemplateExpression */
+        return kind === 218 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -12213,33 +12811,33 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 198 /* PropertyAccessExpression */:
-            case 199 /* ElementAccessExpression */:
-            case 201 /* NewExpression */:
-            case 200 /* CallExpression */:
-            case 270 /* JsxElement */:
-            case 271 /* JsxSelfClosingElement */:
-            case 274 /* JsxFragment */:
-            case 202 /* TaggedTemplateExpression */:
-            case 196 /* ArrayLiteralExpression */:
-            case 204 /* ParenthesizedExpression */:
-            case 197 /* ObjectLiteralExpression */:
-            case 218 /* ClassExpression */:
-            case 205 /* FunctionExpression */:
+            case 201 /* PropertyAccessExpression */:
+            case 202 /* ElementAccessExpression */:
+            case 204 /* NewExpression */:
+            case 203 /* CallExpression */:
+            case 273 /* JsxElement */:
+            case 274 /* JsxSelfClosingElement */:
+            case 277 /* JsxFragment */:
+            case 205 /* TaggedTemplateExpression */:
+            case 199 /* ArrayLiteralExpression */:
+            case 207 /* ParenthesizedExpression */:
+            case 200 /* ObjectLiteralExpression */:
+            case 221 /* ClassExpression */:
+            case 208 /* FunctionExpression */:
             case 78 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 215 /* TemplateExpression */:
+            case 218 /* TemplateExpression */:
             case 94 /* FalseKeyword */:
             case 103 /* NullKeyword */:
             case 107 /* ThisKeyword */:
             case 109 /* TrueKeyword */:
             case 105 /* SuperKeyword */:
-            case 222 /* NonNullExpression */:
-            case 223 /* MetaProperty */:
+            case 225 /* NonNullExpression */:
+            case 226 /* MetaProperty */:
             case 99 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
@@ -12253,13 +12851,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 211 /* PrefixUnaryExpression */:
-            case 212 /* PostfixUnaryExpression */:
-            case 207 /* DeleteExpression */:
-            case 208 /* TypeOfExpression */:
-            case 209 /* VoidExpression */:
-            case 210 /* AwaitExpression */:
-            case 203 /* TypeAssertionExpression */:
+            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
+            case 210 /* DeleteExpression */:
+            case 211 /* TypeOfExpression */:
+            case 212 /* VoidExpression */:
+            case 213 /* AwaitExpression */:
+            case 206 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -12268,9 +12866,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 212 /* PostfixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
                 return true;
-            case 211 /* PrefixUnaryExpression */:
+            case 214 /* PrefixUnaryExpression */:
                 return expr.operator === 45 /* PlusPlusToken */ ||
                     expr.operator === 46 /* MinusMinusToken */;
             default:
@@ -12289,15 +12887,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 214 /* ConditionalExpression */:
-            case 216 /* YieldExpression */:
-            case 206 /* ArrowFunction */:
-            case 213 /* BinaryExpression */:
-            case 217 /* SpreadElement */:
-            case 221 /* AsExpression */:
-            case 219 /* OmittedExpression */:
-            case 332 /* CommaListExpression */:
-            case 331 /* PartiallyEmittedExpression */:
+            case 217 /* ConditionalExpression */:
+            case 219 /* YieldExpression */:
+            case 209 /* ArrowFunction */:
+            case 216 /* BinaryExpression */:
+            case 220 /* SpreadElement */:
+            case 224 /* AsExpression */:
+            case 222 /* OmittedExpression */:
+            case 337 /* CommaListExpression */:
+            case 336 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -12305,8 +12903,8 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 203 /* TypeAssertionExpression */
-            || kind === 221 /* AsExpression */;
+        return kind === 206 /* TypeAssertionExpression */
+            || kind === 224 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
@@ -12317,13 +12915,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 234 /* ForStatement */:
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
-            case 232 /* DoStatement */:
-            case 233 /* WhileStatement */:
+            case 237 /* ForStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
+            case 235 /* DoStatement */:
+            case 236 /* WhileStatement */:
                 return true;
-            case 242 /* LabeledStatement */:
+            case 245 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -12352,7 +12950,7 @@ var ts;
     ts.isExternalModuleIndicator = isExternalModuleIndicator;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 235 /* ForInStatement */ || node.kind === 236 /* ForOfStatement */;
+        return node.kind === 238 /* ForInStatement */ || node.kind === 239 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -12376,114 +12974,114 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 254 /* ModuleBlock */
-            || kind === 253 /* ModuleDeclaration */
+        return kind === 257 /* ModuleBlock */
+            || kind === 256 /* ModuleDeclaration */
             || kind === 78 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 254 /* ModuleBlock */
-            || kind === 253 /* ModuleDeclaration */;
+        return kind === 257 /* ModuleBlock */
+            || kind === 256 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
         return kind === 78 /* Identifier */
-            || kind === 253 /* ModuleDeclaration */;
+            || kind === 256 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 261 /* NamedImports */
-            || kind === 260 /* NamespaceImport */;
+        return kind === 264 /* NamedImports */
+            || kind === 263 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 253 /* ModuleDeclaration */ || node.kind === 252 /* EnumDeclaration */;
+        return node.kind === 256 /* ModuleDeclaration */ || node.kind === 255 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 206 /* ArrowFunction */
-            || kind === 195 /* BindingElement */
-            || kind === 249 /* ClassDeclaration */
-            || kind === 218 /* ClassExpression */
-            || kind === 165 /* Constructor */
-            || kind === 252 /* EnumDeclaration */
-            || kind === 288 /* EnumMember */
-            || kind === 267 /* ExportSpecifier */
-            || kind === 248 /* FunctionDeclaration */
-            || kind === 205 /* FunctionExpression */
-            || kind === 166 /* GetAccessor */
-            || kind === 259 /* ImportClause */
-            || kind === 257 /* ImportEqualsDeclaration */
-            || kind === 262 /* ImportSpecifier */
-            || kind === 250 /* InterfaceDeclaration */
-            || kind === 277 /* JsxAttribute */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 163 /* MethodSignature */
-            || kind === 253 /* ModuleDeclaration */
-            || kind === 256 /* NamespaceExportDeclaration */
-            || kind === 260 /* NamespaceImport */
-            || kind === 266 /* NamespaceExport */
-            || kind === 159 /* Parameter */
-            || kind === 285 /* PropertyAssignment */
-            || kind === 162 /* PropertyDeclaration */
-            || kind === 161 /* PropertySignature */
-            || kind === 167 /* SetAccessor */
-            || kind === 286 /* ShorthandPropertyAssignment */
-            || kind === 251 /* TypeAliasDeclaration */
-            || kind === 158 /* TypeParameter */
-            || kind === 246 /* VariableDeclaration */
-            || kind === 327 /* JSDocTypedefTag */
-            || kind === 320 /* JSDocCallbackTag */
-            || kind === 328 /* JSDocPropertyTag */;
+        return kind === 209 /* ArrowFunction */
+            || kind === 198 /* BindingElement */
+            || kind === 252 /* ClassDeclaration */
+            || kind === 221 /* ClassExpression */
+            || kind === 166 /* Constructor */
+            || kind === 255 /* EnumDeclaration */
+            || kind === 291 /* EnumMember */
+            || kind === 270 /* ExportSpecifier */
+            || kind === 251 /* FunctionDeclaration */
+            || kind === 208 /* FunctionExpression */
+            || kind === 167 /* GetAccessor */
+            || kind === 262 /* ImportClause */
+            || kind === 260 /* ImportEqualsDeclaration */
+            || kind === 265 /* ImportSpecifier */
+            || kind === 253 /* InterfaceDeclaration */
+            || kind === 280 /* JsxAttribute */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 164 /* MethodSignature */
+            || kind === 256 /* ModuleDeclaration */
+            || kind === 259 /* NamespaceExportDeclaration */
+            || kind === 263 /* NamespaceImport */
+            || kind === 269 /* NamespaceExport */
+            || kind === 160 /* Parameter */
+            || kind === 288 /* PropertyAssignment */
+            || kind === 163 /* PropertyDeclaration */
+            || kind === 162 /* PropertySignature */
+            || kind === 168 /* SetAccessor */
+            || kind === 289 /* ShorthandPropertyAssignment */
+            || kind === 254 /* TypeAliasDeclaration */
+            || kind === 159 /* TypeParameter */
+            || kind === 249 /* VariableDeclaration */
+            || kind === 331 /* JSDocTypedefTag */
+            || kind === 324 /* JSDocCallbackTag */
+            || kind === 333 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 248 /* FunctionDeclaration */
-            || kind === 268 /* MissingDeclaration */
-            || kind === 249 /* ClassDeclaration */
-            || kind === 250 /* InterfaceDeclaration */
-            || kind === 251 /* TypeAliasDeclaration */
-            || kind === 252 /* EnumDeclaration */
-            || kind === 253 /* ModuleDeclaration */
-            || kind === 258 /* ImportDeclaration */
-            || kind === 257 /* ImportEqualsDeclaration */
-            || kind === 264 /* ExportDeclaration */
-            || kind === 263 /* ExportAssignment */
-            || kind === 256 /* NamespaceExportDeclaration */;
+        return kind === 251 /* FunctionDeclaration */
+            || kind === 271 /* MissingDeclaration */
+            || kind === 252 /* ClassDeclaration */
+            || kind === 253 /* InterfaceDeclaration */
+            || kind === 254 /* TypeAliasDeclaration */
+            || kind === 255 /* EnumDeclaration */
+            || kind === 256 /* ModuleDeclaration */
+            || kind === 261 /* ImportDeclaration */
+            || kind === 260 /* ImportEqualsDeclaration */
+            || kind === 267 /* ExportDeclaration */
+            || kind === 266 /* ExportAssignment */
+            || kind === 259 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 238 /* BreakStatement */
-            || kind === 237 /* ContinueStatement */
-            || kind === 245 /* DebuggerStatement */
-            || kind === 232 /* DoStatement */
-            || kind === 230 /* ExpressionStatement */
-            || kind === 228 /* EmptyStatement */
-            || kind === 235 /* ForInStatement */
-            || kind === 236 /* ForOfStatement */
-            || kind === 234 /* ForStatement */
-            || kind === 231 /* IfStatement */
-            || kind === 242 /* LabeledStatement */
-            || kind === 239 /* ReturnStatement */
-            || kind === 241 /* SwitchStatement */
-            || kind === 243 /* ThrowStatement */
-            || kind === 244 /* TryStatement */
-            || kind === 229 /* VariableStatement */
-            || kind === 233 /* WhileStatement */
-            || kind === 240 /* WithStatement */
-            || kind === 330 /* NotEmittedStatement */
-            || kind === 334 /* EndOfDeclarationMarker */
-            || kind === 333 /* MergeDeclarationMarker */;
+        return kind === 241 /* BreakStatement */
+            || kind === 240 /* ContinueStatement */
+            || kind === 248 /* DebuggerStatement */
+            || kind === 235 /* DoStatement */
+            || kind === 233 /* ExpressionStatement */
+            || kind === 231 /* EmptyStatement */
+            || kind === 238 /* ForInStatement */
+            || kind === 239 /* ForOfStatement */
+            || kind === 237 /* ForStatement */
+            || kind === 234 /* IfStatement */
+            || kind === 245 /* LabeledStatement */
+            || kind === 242 /* ReturnStatement */
+            || kind === 244 /* SwitchStatement */
+            || kind === 246 /* ThrowStatement */
+            || kind === 247 /* TryStatement */
+            || kind === 232 /* VariableStatement */
+            || kind === 236 /* WhileStatement */
+            || kind === 243 /* WithStatement */
+            || kind === 335 /* NotEmittedStatement */
+            || kind === 339 /* EndOfDeclarationMarker */
+            || kind === 338 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 158 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 326 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 159 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 330 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -12510,10 +13108,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 227 /* Block */)
+        if (node.kind !== 230 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 244 /* TryStatement */ || node.parent.kind === 284 /* CatchClause */) {
+            if (node.parent.kind === 247 /* TryStatement */ || node.parent.kind === 287 /* CatchClause */) {
                 return false;
             }
         }
@@ -12527,15 +13125,15 @@ var ts;
         var kind = node.kind;
         return isStatementKindButNotDeclarationKind(kind)
             || isDeclarationStatementKind(kind)
-            || kind === 227 /* Block */;
+            || kind === 230 /* Block */;
     }
     ts.isStatementOrBlock = isStatementOrBlock;
     // Module references
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 269 /* ExternalModuleReference */
-            || kind === 156 /* QualifiedName */
+        return kind === 272 /* ExternalModuleReference */
+            || kind === 157 /* QualifiedName */
             || kind === 78 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
@@ -12545,70 +13143,70 @@ var ts;
         var kind = node.kind;
         return kind === 107 /* ThisKeyword */
             || kind === 78 /* Identifier */
-            || kind === 198 /* PropertyAccessExpression */;
+            || kind === 201 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 270 /* JsxElement */
-            || kind === 280 /* JsxExpression */
-            || kind === 271 /* JsxSelfClosingElement */
+        return kind === 273 /* JsxElement */
+            || kind === 283 /* JsxExpression */
+            || kind === 274 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 274 /* JsxFragment */;
+            || kind === 277 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 277 /* JsxAttribute */
-            || kind === 279 /* JsxSpreadAttribute */;
+        return kind === 280 /* JsxAttribute */
+            || kind === 282 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 280 /* JsxExpression */;
+            || kind === 283 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 272 /* JsxOpeningElement */
-            || kind === 271 /* JsxSelfClosingElement */;
+        return kind === 275 /* JsxOpeningElement */
+            || kind === 274 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 281 /* CaseClause */
-            || kind === 282 /* DefaultClause */;
+        return kind === 284 /* CaseClause */
+            || kind === 285 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 298 /* FirstJSDocNode */ && node.kind <= 328 /* LastJSDocNode */;
+        return node.kind >= 301 /* FirstJSDocNode */ && node.kind <= 333 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 307 /* JSDocComment */ || node.kind === 306 /* JSDocNamepathType */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 311 /* JSDocComment */ || node.kind === 310 /* JSDocNamepathType */ || 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 >= 310 /* FirstJSDocTagNode */ && node.kind <= 328 /* LastJSDocTagNode */;
+        return node.kind >= 314 /* FirstJSDocTagNode */ && node.kind <= 333 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 167 /* SetAccessor */;
+        return node.kind === 168 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 166 /* GetAccessor */;
+        return node.kind === 167 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -12634,13 +13232,13 @@ var ts;
     /** True if has initializer node attached to it. */
     function hasOnlyExpressionInitializer(node) {
         switch (node.kind) {
-            case 246 /* VariableDeclaration */:
-            case 159 /* Parameter */:
-            case 195 /* BindingElement */:
-            case 161 /* PropertySignature */:
-            case 162 /* PropertyDeclaration */:
-            case 285 /* PropertyAssignment */:
-            case 288 /* EnumMember */:
+            case 249 /* VariableDeclaration */:
+            case 160 /* Parameter */:
+            case 198 /* BindingElement */:
+            case 162 /* PropertySignature */:
+            case 163 /* PropertyDeclaration */:
+            case 288 /* PropertyAssignment */:
+            case 291 /* EnumMember */:
                 return true;
             default:
                 return false;
@@ -12648,12 +13246,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 277 /* JsxAttribute */ || node.kind === 279 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 280 /* JsxAttribute */ || node.kind === 282 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 172 /* TypeReference */ || node.kind === 220 /* ExpressionWithTypeArguments */;
+        return node.kind === 173 /* TypeReference */ || node.kind === 223 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -12786,20 +13384,6 @@ var ts;
         });
     }
     ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
-    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);
@@ -12948,7 +13532,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 294 /* SourceFile */) {
+        while (node && node.kind !== 297 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -12956,11 +13540,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 227 /* Block */:
-            case 255 /* CaseBlock */:
-            case 234 /* ForStatement */:
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
+            case 230 /* Block */:
+            case 258 /* CaseBlock */:
+            case 237 /* ForStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -13156,7 +13740,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 === 329 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 334 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -13175,8 +13759,12 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return !!findAncestor(node, ts.isJSDocTypeExpression);
+        return !!ts.findAncestor(node, ts.isJSDocTypeExpression);
+    }
+    function isExportNamespaceAsDefaultDeclaration(node) {
+        return !!(ts.isExportDeclaration(node) && node.exportClause && ts.isNamespaceExport(node.exportClause) && node.exportClause.name.escapedText === "default");
     }
+    ts.isExportNamespaceAsDefaultDeclaration = isExportNamespaceAsDefaultDeclaration;
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
         if (nodeIsMissing(node)) {
@@ -13214,10 +13802,85 @@ var ts;
         return emitNode && emitNode.flags || 0;
     }
     ts.getEmitFlags = getEmitFlags;
-    function getLiteralText(node, sourceFile, neverAsciiEscape, jsxAttributeEscape) {
+    ;
+    function getScriptTargetFeatures() {
+        return {
+            es2015: {
+                Array: ["find", "findIndex", "fill", "copyWithin", "entries", "keys", "values"],
+                RegExp: ["flags", "sticky", "unicode"],
+                Reflect: ["apply", "construct", "defineProperty", "deleteProperty", "get", " getOwnPropertyDescriptor", "getPrototypeOf", "has", "isExtensible", "ownKeys", "preventExtensions", "set", "setPrototypeOf"],
+                ArrayConstructor: ["from", "of"],
+                ObjectConstructor: ["assign", "getOwnPropertySymbols", "keys", "is", "setPrototypeOf"],
+                NumberConstructor: ["isFinite", "isInteger", "isNaN", "isSafeInteger", "parseFloat", "parseInt"],
+                Math: ["clz32", "imul", "sign", "log10", "log2", "log1p", "expm1", "cosh", "sinh", "tanh", "acosh", "asinh", "atanh", "hypot", "trunc", "fround", "cbrt"],
+                Map: ["entries", "keys", "values"],
+                Set: ["entries", "keys", "values"],
+                Promise: ts.emptyArray,
+                PromiseConstructor: ["all", "race", "reject", "resolve"],
+                Symbol: ["for", "keyFor"],
+                WeakMap: ["entries", "keys", "values"],
+                WeakSet: ["entries", "keys", "values"],
+                Iterator: ts.emptyArray,
+                AsyncIterator: ts.emptyArray,
+                String: ["codePointAt", "includes", "endsWith", "normalize", "repeat", "startsWith", "anchor", "big", "blink", "bold", "fixed", "fontcolor", "fontsize", "italics", "link", "small", "strike", "sub", "sup"],
+                StringConstructor: ["fromCodePoint", "raw"]
+            },
+            es2016: {
+                Array: ["includes"]
+            },
+            es2017: {
+                Atomics: ts.emptyArray,
+                SharedArrayBuffer: ts.emptyArray,
+                String: ["padStart", "padEnd"],
+                ObjectConstructor: ["values", "entries", "getOwnPropertyDescriptors"],
+                DateTimeFormat: ["formatToParts"]
+            },
+            es2018: {
+                Promise: ["finally"],
+                RegExpMatchArray: ["groups"],
+                RegExpExecArray: ["groups"],
+                RegExp: ["dotAll"],
+                Intl: ["PluralRules"],
+                AsyncIterable: ts.emptyArray,
+                AsyncIterableIterator: ts.emptyArray,
+                AsyncGenerator: ts.emptyArray,
+                AsyncGeneratorFunction: ts.emptyArray,
+            },
+            es2019: {
+                Array: ["flat", "flatMap"],
+                ObjectConstructor: ["fromEntries"],
+                String: ["trimStart", "trimEnd", "trimLeft", "trimRight"],
+                Symbol: ["description"]
+            },
+            es2020: {
+                BigInt: ts.emptyArray,
+                BigInt64Array: ts.emptyArray,
+                BigUint64Array: ts.emptyArray,
+                PromiseConstructor: ["allSettled"],
+                SymbolConstructor: ["matchAll"],
+                String: ["matchAll"],
+                DataView: ["setBigInt64", "setBigUint64", "getBigInt64", "getBigUint64"],
+                RelativeTimeFormat: ["format", "formatToParts", "resolvedOptions"]
+            },
+            esnext: {
+                PromiseConstructor: ["any"],
+                String: ["replaceAll"],
+                NumberFormat: ["formatToParts"]
+            }
+        };
+    }
+    ts.getScriptTargetFeatures = getScriptTargetFeatures;
+    var GetLiteralTextFlags;
+    (function (GetLiteralTextFlags) {
+        GetLiteralTextFlags[GetLiteralTextFlags["None"] = 0] = "None";
+        GetLiteralTextFlags[GetLiteralTextFlags["NeverAsciiEscape"] = 1] = "NeverAsciiEscape";
+        GetLiteralTextFlags[GetLiteralTextFlags["JsxAttributeEscape"] = 2] = "JsxAttributeEscape";
+        GetLiteralTextFlags[GetLiteralTextFlags["TerminateUnterminatedLiterals"] = 4] = "TerminateUnterminatedLiterals";
+    })(GetLiteralTextFlags = ts.GetLiteralTextFlags || (ts.GetLiteralTextFlags = {}));
+    function getLiteralText(node, sourceFile, flags) {
         // 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 */) ||
+        if (!nodeIsSynthesized(node) && node.parent && !(flags & 4 /* TerminateUnterminatedLiterals */ && node.isUnterminated) && !((ts.isNumericLiteral(node) && node.numericLiteralFlags & 512 /* ContainsSeparator */) ||
             ts.isBigIntLiteral(node))) {
             return getSourceTextOfNodeFromSourceFile(sourceFile, node);
         }
@@ -13225,8 +13888,8 @@ var ts;
         // or a (possibly escaped) quoted form of the original text if it's string-like.
         switch (node.kind) {
             case 10 /* StringLiteral */: {
-                var escapeText = jsxAttributeEscape ? escapeJsxAttributeString :
-                    neverAsciiEscape || (getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? escapeString :
+                var escapeText = flags & 2 /* JsxAttributeEscape */ ? escapeJsxAttributeString :
+                    flags & 1 /* NeverAsciiEscape */ || (getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? escapeString :
                         escapeNonAsciiString;
                 if (node.singleQuote) {
                     return "'" + escapeText(node.text, 39 /* singleQuote */) + "'";
@@ -13241,7 +13904,7 @@ var ts;
             case 17 /* TemplateTail */: {
                 // If a NoSubstitutionTemplateLiteral appears to have a substitution in it, the original text
                 // had to include a backslash: `not \${a} substitution`.
-                var escapeText = neverAsciiEscape || (getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? escapeString :
+                var escapeText = flags & 1 /* NeverAsciiEscape */ || (getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? escapeString :
                     escapeNonAsciiString;
                 var rawText = node.rawText || escapeTemplateSubstitution(escapeText(node.text, 96 /* backtick */));
                 switch (node.kind) {
@@ -13258,7 +13921,11 @@ var ts;
             }
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
+                return node.text;
             case 13 /* RegularExpressionLiteral */:
+                if (flags & 4 /* TerminateUnterminatedLiterals */ && node.isUnterminated) {
+                    return node.text + (node.text.charCodeAt(node.text.length - 1) === 92 /* backslash */ ? " /" : "/");
+                }
                 return node.text;
         }
         return ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
@@ -13281,7 +13948,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 246 /* VariableDeclaration */ && node.parent.kind === 284 /* CatchClause */;
+        return node.kind === 249 /* VariableDeclaration */ && node.parent.kind === 287 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -13313,11 +13980,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 === 253 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 256 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 294 /* SourceFile */ ||
-            node.kind === 253 /* ModuleDeclaration */ ||
+        return node.kind === 297 /* SourceFile */ ||
+            node.kind === 256 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -13334,9 +14001,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 294 /* SourceFile */:
+            case 297 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 254 /* ModuleBlock */:
+            case 257 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -13389,22 +14056,22 @@ var ts;
     ts.isEffectiveStrictModeSourceFile = isEffectiveStrictModeSourceFile;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 294 /* SourceFile */:
-            case 255 /* CaseBlock */:
-            case 284 /* CatchClause */:
-            case 253 /* ModuleDeclaration */:
-            case 234 /* ForStatement */:
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
-            case 165 /* Constructor */:
-            case 164 /* MethodDeclaration */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
+            case 297 /* SourceFile */:
+            case 258 /* CaseBlock */:
+            case 287 /* CatchClause */:
+            case 256 /* ModuleDeclaration */:
+            case 237 /* ForStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
+            case 166 /* Constructor */:
+            case 165 /* MethodDeclaration */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
                 return true;
-            case 227 /* Block */:
+            case 230 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -13414,9 +14081,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 320 /* JSDocCallbackTag */:
-            case 327 /* JSDocTypedefTag */:
-            case 309 /* JSDocSignature */:
+            case 324 /* JSDocCallbackTag */:
+            case 331 /* JSDocTypedefTag */:
+            case 313 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -13426,25 +14093,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 168 /* CallSignature */:
-            case 169 /* ConstructSignature */:
-            case 163 /* MethodSignature */:
-            case 170 /* IndexSignature */:
-            case 173 /* FunctionType */:
-            case 174 /* ConstructorType */:
-            case 304 /* JSDocFunctionType */:
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
-            case 250 /* InterfaceDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
-            case 326 /* JSDocTemplateTag */:
-            case 248 /* FunctionDeclaration */:
-            case 164 /* MethodDeclaration */:
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
+            case 169 /* CallSignature */:
+            case 170 /* ConstructSignature */:
+            case 164 /* MethodSignature */:
+            case 171 /* IndexSignature */:
+            case 174 /* FunctionType */:
+            case 175 /* ConstructorType */:
+            case 308 /* JSDocFunctionType */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* ClassExpression */:
+            case 253 /* InterfaceDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
+            case 330 /* JSDocTemplateTag */:
+            case 251 /* FunctionDeclaration */:
+            case 165 /* MethodDeclaration */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -13454,8 +14121,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 258 /* ImportDeclaration */:
-            case 257 /* ImportEqualsDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -13464,15 +14131,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 258 /* ImportDeclaration */:
-            case 257 /* ImportEqualsDeclaration */:
-            case 229 /* VariableStatement */:
-            case 249 /* ClassDeclaration */:
-            case 248 /* FunctionDeclaration */:
-            case 253 /* ModuleDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
-            case 250 /* InterfaceDeclaration */:
-            case 252 /* EnumDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
+            case 232 /* VariableStatement */:
+            case 252 /* ClassDeclaration */:
+            case 251 /* FunctionDeclaration */:
+            case 256 /* ModuleDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 255 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -13486,7 +14153,7 @@ var ts;
     // 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); });
+        return ts.findAncestor(node.parent, function (current) { return isBlockScope(current, current.parent); });
     }
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     // Return display name of an identifier
@@ -13501,7 +14168,7 @@ var ts;
     }
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function isComputedNonLiteralName(name) {
-        return name.kind === 157 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
+        return name.kind === 158 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
     function getTextOfPropertyName(name) {
@@ -13513,7 +14180,7 @@ var ts;
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 157 /* ComputedPropertyName */:
+            case 158 /* 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");
@@ -13529,9 +14196,9 @@ var ts;
             case 79 /* PrivateIdentifier */:
             case 78 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 198 /* PropertyAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
                 if (ts.isIdentifier(name.name) || ts.isPrivateIdentifier(name.name)) {
                     return entityNameToString(name.expression) + "." + entityNameToString(name.name);
                 }
@@ -13572,6 +14239,18 @@ var ts;
         };
     }
     ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function createDiagnosticForFileFromMessageChain(sourceFile, messageChain, relatedInformation) {
+        return {
+            file: sourceFile,
+            start: 0,
+            length: 0,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText,
+            relatedInformation: relatedInformation
+        };
+    }
+    ts.createDiagnosticForFileFromMessageChain = createDiagnosticForFileFromMessageChain;
     function createDiagnosticForRange(sourceFile, range, message) {
         return {
             file: sourceFile,
@@ -13592,7 +14271,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 227 /* Block */) {
+        if (node.body && node.body.kind === 230 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -13606,7 +14285,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 294 /* SourceFile */:
+            case 297 /* 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
@@ -13615,28 +14294,28 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 246 /* VariableDeclaration */:
-            case 195 /* BindingElement */:
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
-            case 250 /* InterfaceDeclaration */:
-            case 253 /* ModuleDeclaration */:
-            case 252 /* EnumDeclaration */:
-            case 288 /* EnumMember */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 164 /* MethodDeclaration */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 251 /* TypeAliasDeclaration */:
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
+            case 249 /* VariableDeclaration */:
+            case 198 /* BindingElement */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* ClassExpression */:
+            case 253 /* InterfaceDeclaration */:
+            case 256 /* ModuleDeclaration */:
+            case 255 /* EnumDeclaration */:
+            case 291 /* EnumMember */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 165 /* MethodDeclaration */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 254 /* TypeAliasDeclaration */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 206 /* ArrowFunction */:
+            case 209 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
-            case 281 /* CaseClause */:
-            case 282 /* DefaultClause */:
+            case 284 /* CaseClause */:
+            case 285 /* DefaultClause */:
                 var start = ts.skipTrivia(sourceFile.text, node.pos);
                 var end = node.statements.length > 0 ? node.statements[0].pos : node.end;
                 return ts.createTextSpanFromBounds(start, end);
@@ -13688,11 +14367,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 200 /* CallExpression */ && n.expression.kind === 105 /* SuperKeyword */;
+        return n.kind === 203 /* CallExpression */ && n.expression.kind === 105 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 200 /* CallExpression */ && n.expression.kind === 99 /* ImportKeyword */;
+        return n.kind === 203 /* CallExpression */ && n.expression.kind === 99 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isImportMeta(n) {
@@ -13706,7 +14385,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 230 /* ExpressionStatement */
+        return node.kind === 233 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -13734,11 +14413,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 159 /* Parameter */ ||
-            node.kind === 158 /* TypeParameter */ ||
-            node.kind === 205 /* FunctionExpression */ ||
-            node.kind === 206 /* ArrowFunction */ ||
-            node.kind === 204 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 160 /* Parameter */ ||
+            node.kind === 159 /* TypeParameter */ ||
+            node.kind === 208 /* FunctionExpression */ ||
+            node.kind === 209 /* ArrowFunction */ ||
+            node.kind === 207 /* 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 '/**/'
@@ -13754,48 +14433,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 (171 /* FirstTypeNode */ <= node.kind && node.kind <= 192 /* LastTypeNode */) {
+        if (172 /* FirstTypeNode */ <= node.kind && node.kind <= 195 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
             case 128 /* AnyKeyword */:
-            case 151 /* UnknownKeyword */:
-            case 143 /* NumberKeyword */:
-            case 154 /* BigIntKeyword */:
-            case 146 /* StringKeyword */:
+            case 152 /* UnknownKeyword */:
+            case 144 /* NumberKeyword */:
+            case 155 /* BigIntKeyword */:
+            case 147 /* StringKeyword */:
             case 131 /* BooleanKeyword */:
-            case 147 /* SymbolKeyword */:
-            case 144 /* ObjectKeyword */:
-            case 149 /* UndefinedKeyword */:
-            case 140 /* NeverKeyword */:
+            case 148 /* SymbolKeyword */:
+            case 145 /* ObjectKeyword */:
+            case 150 /* UndefinedKeyword */:
+            case 141 /* NeverKeyword */:
                 return true;
             case 113 /* VoidKeyword */:
-                return node.parent.kind !== 209 /* VoidExpression */;
-            case 220 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 212 /* VoidExpression */;
+            case 223 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 158 /* TypeParameter */:
-                return node.parent.kind === 189 /* MappedType */ || node.parent.kind === 184 /* InferType */;
+            case 159 /* TypeParameter */:
+                return node.parent.kind === 190 /* MappedType */ || node.parent.kind === 185 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
             case 78 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 156 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 157 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 201 /* 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 === 78 /* Identifier */ || node.kind === 156 /* QualifiedName */ || node.kind === 198 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 78 /* Identifier */ || node.kind === 157 /* QualifiedName */ || node.kind === 201 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 156 /* QualifiedName */:
-            case 198 /* PropertyAccessExpression */:
+            case 157 /* QualifiedName */:
+            case 201 /* PropertyAccessExpression */:
             case 107 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 175 /* TypeQuery */) {
+                if (parent.kind === 176 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 192 /* ImportType */) {
+                if (parent.kind === 195 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -13804,40 +14483,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 (171 /* FirstTypeNode */ <= parent.kind && parent.kind <= 192 /* LastTypeNode */) {
+                if (172 /* FirstTypeNode */ <= parent.kind && parent.kind <= 195 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 220 /* ExpressionWithTypeArguments */:
+                    case 223 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 158 /* TypeParameter */:
+                    case 159 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 326 /* JSDocTemplateTag */:
+                    case 330 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 162 /* PropertyDeclaration */:
-                    case 161 /* PropertySignature */:
-                    case 159 /* Parameter */:
-                    case 246 /* VariableDeclaration */:
+                    case 163 /* PropertyDeclaration */:
+                    case 162 /* PropertySignature */:
+                    case 160 /* Parameter */:
+                    case 249 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
-                    case 165 /* Constructor */:
-                    case 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
+                    case 166 /* Constructor */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         return node === parent.type;
-                    case 168 /* CallSignature */:
-                    case 169 /* ConstructSignature */:
-                    case 170 /* IndexSignature */:
+                    case 169 /* CallSignature */:
+                    case 170 /* ConstructSignature */:
+                    case 171 /* IndexSignature */:
                         return node === parent.type;
-                    case 203 /* TypeAssertionExpression */:
+                    case 206 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 200 /* CallExpression */:
-                    case 201 /* NewExpression */:
+                    case 203 /* CallExpression */:
+                    case 204 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 202 /* TaggedTemplateExpression */:
+                    case 205 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -13862,23 +14541,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return visitor(node);
-                case 255 /* CaseBlock */:
-                case 227 /* Block */:
-                case 231 /* IfStatement */:
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
-                case 240 /* WithStatement */:
-                case 241 /* SwitchStatement */:
-                case 281 /* CaseClause */:
-                case 282 /* DefaultClause */:
-                case 242 /* LabeledStatement */:
-                case 244 /* TryStatement */:
-                case 284 /* CatchClause */:
+                case 258 /* CaseBlock */:
+                case 230 /* Block */:
+                case 234 /* IfStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
+                case 243 /* WithStatement */:
+                case 244 /* SwitchStatement */:
+                case 284 /* CaseClause */:
+                case 285 /* DefaultClause */:
+                case 245 /* LabeledStatement */:
+                case 247 /* TryStatement */:
+                case 287 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -13888,23 +14567,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 252 /* EnumDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, skip them to avoid the work.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 157 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 158 /* 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);
@@ -13927,10 +14606,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 177 /* ArrayType */) {
+        if (node && node.kind === 178 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 172 /* TypeReference */) {
+        else if (node && node.kind === 173 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -13940,12 +14619,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 250 /* InterfaceDeclaration */:
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
-            case 176 /* TypeLiteral */:
+            case 253 /* InterfaceDeclaration */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* ClassExpression */:
+            case 177 /* TypeLiteral */:
                 return node.members;
-            case 197 /* ObjectLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -13953,14 +14632,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 195 /* BindingElement */:
-                case 288 /* EnumMember */:
-                case 159 /* Parameter */:
-                case 285 /* PropertyAssignment */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 286 /* ShorthandPropertyAssignment */:
-                case 246 /* VariableDeclaration */:
+                case 198 /* BindingElement */:
+                case 291 /* EnumMember */:
+                case 160 /* Parameter */:
+                case 288 /* PropertyAssignment */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 289 /* ShorthandPropertyAssignment */:
+                case 249 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -13972,8 +14651,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 247 /* VariableDeclarationList */
-            && node.parent.parent.kind === 229 /* VariableStatement */;
+        return node.parent.kind === 250 /* VariableDeclarationList */
+            && node.parent.parent.kind === 232 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -13984,13 +14663,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -14001,7 +14680,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 242 /* LabeledStatement */) {
+            if (node.statement.kind !== 245 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -14009,17 +14688,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 227 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 230 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 164 /* MethodDeclaration */ && node.parent.kind === 197 /* ObjectLiteralExpression */;
+        return node && node.kind === 165 /* MethodDeclaration */ && node.parent.kind === 200 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 164 /* MethodDeclaration */ &&
-            (node.parent.kind === 197 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 218 /* ClassExpression */);
+        return node.kind === 165 /* MethodDeclaration */ &&
+            (node.parent.kind === 200 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 221 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -14032,7 +14711,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 285 /* PropertyAssignment */) {
+            if (property.kind === 288 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -14061,26 +14740,26 @@ var ts;
     }
     ts.getTsConfigPropArray = getTsConfigPropArray;
     function getContainingFunction(node) {
-        return findAncestor(node.parent, ts.isFunctionLike);
+        return ts.findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
     function getContainingFunctionDeclaration(node) {
-        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+        return ts.findAncestor(node.parent, ts.isFunctionLikeDeclaration);
     }
     ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
-        return findAncestor(node.parent, ts.isClassLike);
+        return ts.findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 294 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 297 /* 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 157 /* ComputedPropertyName */:
+                case 158 /* 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
@@ -14095,9 +14774,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 160 /* Decorator */:
+                case 161 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 159 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 160 /* 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;
@@ -14108,26 +14787,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 253 /* ModuleDeclaration */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 165 /* Constructor */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 170 /* IndexSignature */:
-                case 252 /* EnumDeclaration */:
-                case 294 /* SourceFile */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 256 /* ModuleDeclaration */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 166 /* Constructor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 171 /* IndexSignature */:
+                case 255 /* EnumDeclaration */:
+                case 297 /* SourceFile */:
                     return node;
             }
         }
@@ -14146,9 +14825,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 165 /* Constructor */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
+                case 166 /* Constructor */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
                     return container;
             }
         }
@@ -14170,27 +14849,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 165 /* Constructor */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 166 /* Constructor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return node;
-                case 160 /* Decorator */:
+                case 161 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 159 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 160 /* 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;
@@ -14206,14 +14885,14 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 205 /* FunctionExpression */ || func.kind === 206 /* ArrowFunction */) {
+        if (func.kind === 208 /* FunctionExpression */ || func.kind === 209 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 204 /* ParenthesizedExpression */) {
+            while (parent.kind === 207 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 200 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 203 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
@@ -14229,7 +14908,7 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 198 /* PropertyAccessExpression */ || kind === 199 /* ElementAccessExpression */)
+        return (kind === 201 /* PropertyAccessExpression */ || kind === 202 /* ElementAccessExpression */)
             && node.expression.kind === 105 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
@@ -14238,21 +14917,26 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 198 /* PropertyAccessExpression */ || kind === 199 /* ElementAccessExpression */)
+        return (kind === 201 /* PropertyAccessExpression */ || kind === 202 /* ElementAccessExpression */)
             && node.expression.kind === 107 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
+    function isThisInitializedDeclaration(node) {
+        var _a;
+        return !!node && ts.isVariableDeclaration(node) && ((_a = node.initializer) === null || _a === void 0 ? void 0 : _a.kind) === 107 /* ThisKeyword */;
+    }
+    ts.isThisInitializedDeclaration = isThisInitializedDeclaration;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 172 /* TypeReference */:
+            case 173 /* TypeReference */:
                 return node.typeName;
-            case 220 /* ExpressionWithTypeArguments */:
+            case 223 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
             // TODO(rbuckton): These aren't valid TypeNodes, but we treat them as such because of `isPartOfTypeNode`, which returns `true` for things that aren't `TypeNode`s.
             case 78 /* Identifier */:
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -14260,10 +14944,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 202 /* TaggedTemplateExpression */:
+            case 205 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 272 /* JsxOpeningElement */:
-            case 271 /* JsxSelfClosingElement */:
+            case 275 /* JsxOpeningElement */:
+            case 274 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -14276,25 +14960,25 @@ var ts;
             return false;
         }
         switch (node.kind) {
-            case 249 /* ClassDeclaration */:
+            case 252 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 162 /* PropertyDeclaration */:
+            case 163 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 249 /* ClassDeclaration */;
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 164 /* MethodDeclaration */:
+                return parent.kind === 252 /* ClassDeclaration */;
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 165 /* 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 === 249 /* ClassDeclaration */;
-            case 159 /* Parameter */:
+                    && parent.kind === 252 /* ClassDeclaration */;
+            case 160 /* 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 === 165 /* Constructor */
-                        || parent.kind === 164 /* MethodDeclaration */
-                        || parent.kind === 167 /* SetAccessor */)
-                    && grandparent.kind === 249 /* ClassDeclaration */;
+                    && (parent.kind === 166 /* Constructor */
+                        || parent.kind === 165 /* MethodDeclaration */
+                        || parent.kind === 168 /* SetAccessor */)
+                    && grandparent.kind === 252 /* ClassDeclaration */;
         }
         return false;
     }
@@ -14310,10 +14994,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 249 /* ClassDeclaration */:
+            case 252 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 164 /* MethodDeclaration */:
-            case 167 /* SetAccessor */:
+            case 165 /* MethodDeclaration */:
+            case 168 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -14322,9 +15006,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 272 /* JsxOpeningElement */ ||
-            parent.kind === 271 /* JsxSelfClosingElement */ ||
-            parent.kind === 273 /* JsxClosingElement */) {
+        if (parent.kind === 275 /* JsxOpeningElement */ ||
+            parent.kind === 274 /* JsxSelfClosingElement */ ||
+            parent.kind === 276 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -14337,44 +15021,44 @@ var ts;
             case 109 /* TrueKeyword */:
             case 94 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 196 /* ArrayLiteralExpression */:
-            case 197 /* ObjectLiteralExpression */:
-            case 198 /* PropertyAccessExpression */:
-            case 199 /* ElementAccessExpression */:
-            case 200 /* CallExpression */:
-            case 201 /* NewExpression */:
-            case 202 /* TaggedTemplateExpression */:
-            case 221 /* AsExpression */:
-            case 203 /* TypeAssertionExpression */:
-            case 222 /* NonNullExpression */:
-            case 204 /* ParenthesizedExpression */:
-            case 205 /* FunctionExpression */:
-            case 218 /* ClassExpression */:
-            case 206 /* ArrowFunction */:
-            case 209 /* VoidExpression */:
-            case 207 /* DeleteExpression */:
-            case 208 /* TypeOfExpression */:
-            case 211 /* PrefixUnaryExpression */:
-            case 212 /* PostfixUnaryExpression */:
-            case 213 /* BinaryExpression */:
-            case 214 /* ConditionalExpression */:
-            case 217 /* SpreadElement */:
-            case 215 /* TemplateExpression */:
-            case 219 /* OmittedExpression */:
-            case 270 /* JsxElement */:
-            case 271 /* JsxSelfClosingElement */:
-            case 274 /* JsxFragment */:
-            case 216 /* YieldExpression */:
-            case 210 /* AwaitExpression */:
-            case 223 /* MetaProperty */:
+            case 199 /* ArrayLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
+            case 201 /* PropertyAccessExpression */:
+            case 202 /* ElementAccessExpression */:
+            case 203 /* CallExpression */:
+            case 204 /* NewExpression */:
+            case 205 /* TaggedTemplateExpression */:
+            case 224 /* AsExpression */:
+            case 206 /* TypeAssertionExpression */:
+            case 225 /* NonNullExpression */:
+            case 207 /* ParenthesizedExpression */:
+            case 208 /* FunctionExpression */:
+            case 221 /* ClassExpression */:
+            case 209 /* ArrowFunction */:
+            case 212 /* VoidExpression */:
+            case 210 /* DeleteExpression */:
+            case 211 /* TypeOfExpression */:
+            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
+            case 216 /* BinaryExpression */:
+            case 217 /* ConditionalExpression */:
+            case 220 /* SpreadElement */:
+            case 218 /* TemplateExpression */:
+            case 222 /* OmittedExpression */:
+            case 273 /* JsxElement */:
+            case 274 /* JsxSelfClosingElement */:
+            case 277 /* JsxFragment */:
+            case 219 /* YieldExpression */:
+            case 213 /* AwaitExpression */:
+            case 226 /* MetaProperty */:
                 return true;
-            case 156 /* QualifiedName */:
-                while (node.parent.kind === 156 /* QualifiedName */) {
+            case 157 /* QualifiedName */:
+                while (node.parent.kind === 157 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 175 /* TypeQuery */ || isJSXTagName(node);
+                return node.parent.kind === 176 /* TypeQuery */ || isJSXTagName(node);
             case 78 /* Identifier */:
-                if (node.parent.kind === 175 /* TypeQuery */ || isJSXTagName(node)) {
+                if (node.parent.kind === 176 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
@@ -14392,49 +15076,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 246 /* VariableDeclaration */:
-            case 159 /* Parameter */:
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 288 /* EnumMember */:
-            case 285 /* PropertyAssignment */:
-            case 195 /* BindingElement */:
+            case 249 /* VariableDeclaration */:
+            case 160 /* Parameter */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 291 /* EnumMember */:
+            case 288 /* PropertyAssignment */:
+            case 198 /* BindingElement */:
                 return parent.initializer === node;
-            case 230 /* ExpressionStatement */:
-            case 231 /* IfStatement */:
-            case 232 /* DoStatement */:
-            case 233 /* WhileStatement */:
-            case 239 /* ReturnStatement */:
-            case 240 /* WithStatement */:
-            case 241 /* SwitchStatement */:
-            case 281 /* CaseClause */:
-            case 243 /* ThrowStatement */:
+            case 233 /* ExpressionStatement */:
+            case 234 /* IfStatement */:
+            case 235 /* DoStatement */:
+            case 236 /* WhileStatement */:
+            case 242 /* ReturnStatement */:
+            case 243 /* WithStatement */:
+            case 244 /* SwitchStatement */:
+            case 284 /* CaseClause */:
+            case 246 /* ThrowStatement */:
                 return parent.expression === node;
-            case 234 /* ForStatement */:
+            case 237 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 247 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 250 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 247 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 250 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 203 /* TypeAssertionExpression */:
-            case 221 /* AsExpression */:
+            case 206 /* TypeAssertionExpression */:
+            case 224 /* AsExpression */:
                 return node === parent.expression;
-            case 225 /* TemplateSpan */:
+            case 228 /* TemplateSpan */:
                 return node === parent.expression;
-            case 157 /* ComputedPropertyName */:
+            case 158 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 160 /* Decorator */:
-            case 280 /* JsxExpression */:
-            case 279 /* JsxSpreadAttribute */:
-            case 287 /* SpreadAssignment */:
+            case 161 /* Decorator */:
+            case 283 /* JsxExpression */:
+            case 282 /* JsxSpreadAttribute */:
+            case 290 /* SpreadAssignment */:
                 return true;
-            case 220 /* ExpressionWithTypeArguments */:
+            case 223 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 286 /* ShorthandPropertyAssignment */:
+            case 289 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -14442,14 +15126,14 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isPartOfTypeQuery(node) {
-        while (node.kind === 156 /* QualifiedName */ || node.kind === 78 /* Identifier */) {
+        while (node.kind === 157 /* QualifiedName */ || node.kind === 78 /* Identifier */) {
             node = node.parent;
         }
-        return node.kind === 175 /* TypeQuery */;
+        return node.kind === 176 /* TypeQuery */;
     }
     ts.isPartOfTypeQuery = isPartOfTypeQuery;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 257 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 269 /* ExternalModuleReference */;
+        return node.kind === 260 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 272 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -14457,8 +15141,13 @@ var ts;
         return node.moduleReference.expression;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
+    function getExternalModuleRequireArgument(node) {
+        return isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true)
+            && getLeftmostAccessExpression(node.initializer).arguments[0];
+    }
+    ts.getExternalModuleRequireArgument = getExternalModuleRequireArgument;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 257 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 269 /* ExternalModuleReference */;
+        return node.kind === 260 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 272 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -14490,11 +15179,11 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 146 /* StringKeyword */ || node.typeArguments[0].kind === 143 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 147 /* StringKeyword */ || node.typeArguments[0].kind === 144 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, requireStringLiteralLikeArgument) {
-        if (callExpression.kind !== 200 /* CallExpression */) {
+        if (callExpression.kind !== 203 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
@@ -14509,7 +15198,10 @@ var ts;
     }
     ts.isRequireCall = isRequireCall;
     function isRequireVariableDeclaration(node, requireStringLiteralLikeArgument) {
-        return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(node.initializer, requireStringLiteralLikeArgument);
+        if (node.kind === 198 /* BindingElement */) {
+            node = node.parent.parent;
+        }
+        return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(getLeftmostAccessExpression(node.initializer), requireStringLiteralLikeArgument);
     }
     ts.isRequireVariableDeclaration = isRequireVariableDeclaration;
     function isRequireVariableStatement(node, requireStringLiteralLikeArgument) {
@@ -14527,46 +15219,6 @@ var ts;
         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)) {
-            var parentNode = node.parent;
-            var parentNodeOperator = node.parent.operatorToken.kind;
-            if (parentNodeOperator === 62 /* EqualsToken */ && parentNode.right === node) {
-                name = parentNode.left;
-                decl = name;
-            }
-            else if (parentNodeOperator === 56 /* BarBarToken */ || parentNodeOperator === 60 /* QuestionQuestionToken */) {
-                if (ts.isVariableDeclaration(parentNode.parent) && parentNode.parent.initializer === parentNode) {
-                    name = parentNode.parent.name;
-                    decl = parentNode.parent;
-                }
-                else if (ts.isBinaryExpression(parentNode.parent) && parentNode.parent.operatorToken.kind === 62 /* EqualsToken */ && parentNode.parent.right === parentNode) {
-                    name = parentNode.parent.left;
-                    decl = name;
-                }
-                if (!name || !isBindableStaticNameExpression(name) || !isSameEntityName(name, parentNode.left)) {
-                    return undefined;
-                }
-            }
-        }
-        if (!name || !getExpandoInitializer(node, isPrototypeAccess(name))) {
-            return undefined;
-        }
-        return decl;
-    }
-    ts.getDeclarationOfExpando = getDeclarationOfExpando;
     function isAssignmentDeclaration(decl) {
         return ts.isBinaryExpression(decl) || isAccessExpression(decl) || ts.isIdentifier(decl) || ts.isCallExpression(decl);
     }
@@ -14628,11 +15280,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 205 /* FunctionExpression */ || e.kind === 206 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 208 /* FunctionExpression */ || e.kind === 209 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 205 /* FunctionExpression */ ||
-            initializer.kind === 218 /* ClassExpression */ ||
-            initializer.kind === 206 /* ArrowFunction */) {
+        if (initializer.kind === 208 /* FunctionExpression */ ||
+            initializer.kind === 221 /* ClassExpression */ ||
+            initializer.kind === 209 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -14707,6 +15359,7 @@ var ts;
         }
         return false;
     }
+    ts.isSameEntityName = isSameEntityName;
     function getRightMostAssignedExpression(node) {
         while (isAssignmentExpression(node, /*excludeCompoundAssignments*/ true)) {
             node = node.right;
@@ -14885,7 +15538,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 230 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 233 /* ExpressionStatement */ &&
             (!ts.isElementAccessExpression(expr) || isLiteralLikeElementAccess(expr)) &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
@@ -14906,7 +15559,7 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 248 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 251 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
@@ -14915,14 +15568,14 @@ var ts;
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 258 /* ImportDeclaration */:
-            case 264 /* ExportDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 return node.parent;
-            case 269 /* ExternalModuleReference */:
+            case 272 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 200 /* CallExpression */:
+            case 203 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 190 /* LiteralType */:
+            case 191 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -14932,12 +15585,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 258 /* ImportDeclaration */:
-            case 264 /* ExportDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 257 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 269 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 192 /* ImportType */:
+            case 260 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 272 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 195 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -14946,11 +15599,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 258 /* ImportDeclaration */:
+            case 261 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 257 /* ImportEqualsDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 return node;
-            case 264 /* ExportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 return node.exportClause && ts.tryCast(node.exportClause, ts.isNamespaceExport);
             default:
                 return ts.Debug.assertNever(node);
@@ -14958,7 +15611,7 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 258 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 261 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function forEachImportClauseDeclaration(node, action) {
@@ -14979,13 +15632,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 159 /* Parameter */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 286 /* ShorthandPropertyAssignment */:
-                case 285 /* PropertyAssignment */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 160 /* Parameter */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 289 /* ShorthandPropertyAssignment */:
+                case 288 /* PropertyAssignment */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -14999,7 +15652,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 327 /* JSDocTypedefTag */ || node.kind === 320 /* JSDocCallbackTag */ || node.kind === 321 /* JSDocEnumTag */;
+        return node.kind === 331 /* JSDocTypedefTag */ || node.kind === 324 /* JSDocCallbackTag */ || node.kind === 325 /* JSDocEnumTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -15024,12 +15677,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 229 /* VariableStatement */:
+            case 232 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 162 /* PropertyDeclaration */:
+            case 163 /* PropertyDeclaration */:
                 return node.initializer;
-            case 285 /* PropertyAssignment */:
+            case 288 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -15041,7 +15694,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 253 /* ModuleDeclaration */
+            node.body.kind === 256 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -15056,11 +15709,11 @@ var ts;
             if (ts.hasJSDocNodes(node)) {
                 result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 159 /* Parameter */) {
+            if (node.kind === 160 /* Parameter */) {
                 result = ts.addRange(result, (noCache ? ts.getJSDocParameterTagsNoCache : ts.getJSDocParameterTags)(node));
                 break;
             }
-            if (node.kind === 158 /* TypeParameter */) {
+            if (node.kind === 159 /* TypeParameter */) {
                 result = ts.addRange(result, (noCache ? ts.getJSDocTypeParameterTagsNoCache : ts.getJSDocTypeParameterTags)(node));
                 break;
             }
@@ -15071,10 +15724,10 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 285 /* PropertyAssignment */ ||
-            parent.kind === 263 /* ExportAssignment */ ||
-            parent.kind === 162 /* PropertyDeclaration */ ||
-            parent.kind === 230 /* ExpressionStatement */ && node.kind === 198 /* PropertyAccessExpression */ ||
+        if (parent.kind === 288 /* PropertyAssignment */ ||
+            parent.kind === 266 /* ExportAssignment */ ||
+            parent.kind === 163 /* PropertyDeclaration */ ||
+            parent.kind === 233 /* ExpressionStatement */ && node.kind === 201 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
             ts.isBinaryExpression(node) && node.operatorToken.kind === 62 /* EqualsToken */) {
             return parent;
@@ -15132,7 +15785,7 @@ var ts;
     ts.getEffectiveJSDocHost = getEffectiveJSDocHost;
     /** Use getEffectiveJSDocHost if you additionally need to look for jsdoc on parent nodes, like assignments.  */
     function getJSDocHost(node) {
-        return ts.Debug.checkDefined(findAncestor(node.parent, ts.isJSDoc)).parent;
+        return ts.Debug.checkDefined(ts.findAncestor(node.parent, ts.isJSDoc)).parent;
     }
     ts.getJSDocHost = getJSDocHost;
     function getTypeParameterFromJsDoc(node) {
@@ -15148,7 +15801,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 === 305 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 309 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     function hasTypeArguments(node) {
@@ -15165,31 +15818,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
                         binaryOperator === 62 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 211 /* PrefixUnaryExpression */:
-                case 212 /* PostfixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 45 /* PlusPlusToken */ || unaryOperator === 46 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 204 /* ParenthesizedExpression */:
-                case 196 /* ArrayLiteralExpression */:
-                case 217 /* SpreadElement */:
-                case 222 /* NonNullExpression */:
+                case 207 /* ParenthesizedExpression */:
+                case 199 /* ArrayLiteralExpression */:
+                case 220 /* SpreadElement */:
+                case 225 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -15216,22 +15869,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 227 /* Block */:
-            case 229 /* VariableStatement */:
-            case 240 /* WithStatement */:
-            case 231 /* IfStatement */:
-            case 241 /* SwitchStatement */:
-            case 255 /* CaseBlock */:
-            case 281 /* CaseClause */:
-            case 282 /* DefaultClause */:
-            case 242 /* LabeledStatement */:
-            case 234 /* ForStatement */:
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
-            case 232 /* DoStatement */:
-            case 233 /* WhileStatement */:
-            case 244 /* TryStatement */:
-            case 284 /* CatchClause */:
+            case 230 /* Block */:
+            case 232 /* VariableStatement */:
+            case 243 /* WithStatement */:
+            case 234 /* IfStatement */:
+            case 244 /* SwitchStatement */:
+            case 258 /* CaseBlock */:
+            case 284 /* CaseClause */:
+            case 285 /* DefaultClause */:
+            case 245 /* LabeledStatement */:
+            case 237 /* ForStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
+            case 235 /* DoStatement */:
+            case 236 /* WhileStatement */:
+            case 247 /* TryStatement */:
+            case 287 /* CatchClause */:
                 return true;
         }
         return false;
@@ -15248,30 +15901,44 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 185 /* ParenthesizedType */);
+        return walkUp(node, 186 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 204 /* ParenthesizedExpression */);
+        return walkUp(node, 207 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
+    /**
+     * Walks up parenthesized types.
+     * It returns both the outermost parenthesized type and its parent.
+     * If given node is not a parenthesiezd type, undefined is return as the former.
+     */
+    function walkUpParenthesizedTypesAndGetParentAndChild(node) {
+        var child;
+        while (node && node.kind === 186 /* ParenthesizedType */) {
+            child = node;
+            node = node.parent;
+        }
+        return [child, node];
+    }
+    ts.walkUpParenthesizedTypesAndGetParentAndChild = walkUpParenthesizedTypesAndGetParentAndChild;
     function skipParentheses(node) {
         return ts.skipOuterExpressions(node, 1 /* Parentheses */);
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 204 /* ParenthesizedExpression */) {
+        while (node.kind === 207 /* 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 !== 198 /* PropertyAccessExpression */ && node.kind !== 199 /* ElementAccessExpression */) {
+        if (node.kind !== 201 /* PropertyAccessExpression */ && node.kind !== 202 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 207 /* DeleteExpression */;
+        return node && node.kind === 210 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -15324,7 +15991,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return isStringOrNumericLiteralLike(node) &&
-            node.parent.kind === 157 /* ComputedPropertyName */ &&
+            node.parent.kind === 158 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -15332,26 +15999,26 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 288 /* EnumMember */:
-            case 285 /* PropertyAssignment */:
-            case 198 /* PropertyAccessExpression */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 291 /* EnumMember */:
+            case 288 /* PropertyAssignment */:
+            case 201 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 return parent.right === node;
-            case 195 /* BindingElement */:
-            case 262 /* ImportSpecifier */:
+            case 198 /* BindingElement */:
+            case 265 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 267 /* ExportSpecifier */:
-            case 277 /* JsxAttribute */:
+            case 270 /* ExportSpecifier */:
+            case 280 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -15371,33 +16038,33 @@ var ts;
     // {<Identifier>}
     // {name: <EntityNameExpression>}
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 257 /* ImportEqualsDeclaration */ ||
-            node.kind === 256 /* NamespaceExportDeclaration */ ||
-            node.kind === 259 /* ImportClause */ && !!node.name ||
-            node.kind === 260 /* NamespaceImport */ ||
-            node.kind === 266 /* NamespaceExport */ ||
-            node.kind === 262 /* ImportSpecifier */ ||
-            node.kind === 267 /* ExportSpecifier */ ||
-            node.kind === 263 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 260 /* ImportEqualsDeclaration */ ||
+            node.kind === 259 /* NamespaceExportDeclaration */ ||
+            node.kind === 262 /* ImportClause */ && !!node.name ||
+            node.kind === 263 /* NamespaceImport */ ||
+            node.kind === 269 /* NamespaceExport */ ||
+            node.kind === 265 /* ImportSpecifier */ ||
+            node.kind === 270 /* ExportSpecifier */ ||
+            node.kind === 266 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node) ||
             ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 62 /* EqualsToken */ && isAliasableExpression(node.parent.right) ||
-            node.kind === 286 /* ShorthandPropertyAssignment */ ||
-            node.kind === 285 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
+            node.kind === 289 /* ShorthandPropertyAssignment */ ||
+            node.kind === 288 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
         switch (node.parent.kind) {
-            case 259 /* ImportClause */:
-            case 262 /* ImportSpecifier */:
-            case 260 /* NamespaceImport */:
-            case 267 /* ExportSpecifier */:
-            case 263 /* ExportAssignment */:
-            case 257 /* ImportEqualsDeclaration */:
+            case 262 /* ImportClause */:
+            case 265 /* ImportSpecifier */:
+            case 263 /* NamespaceImport */:
+            case 270 /* ExportSpecifier */:
+            case 266 /* ExportAssignment */:
+            case 260 /* ImportEqualsDeclaration */:
                 return node.parent;
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 do {
                     node = node.parent;
-                } while (node.parent.kind === 156 /* QualifiedName */);
+                } while (node.parent.kind === 157 /* QualifiedName */);
                 return getAliasDeclarationFromName(node);
         }
     }
@@ -15416,7 +16083,7 @@ var ts;
     }
     ts.getExportAssignmentExpression = getExportAssignmentExpression;
     function getPropertyAssignmentAliasLikeExpression(node) {
-        return node.kind === 286 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 285 /* PropertyAssignment */ ? node.initializer :
+        return node.kind === 289 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 288 /* PropertyAssignment */ ? node.initializer :
             node.parent.right;
     }
     ts.getPropertyAssignmentAliasLikeExpression = getPropertyAssignmentAliasLikeExpression;
@@ -15482,11 +16149,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 80 /* FirstKeyword */ <= token && token <= 155 /* LastKeyword */;
+        return 80 /* FirstKeyword */ <= token && token <= 156 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 125 /* FirstContextualKeyword */ <= token && token <= 155 /* LastContextualKeyword */;
+        return 125 /* FirstContextualKeyword */ <= token && token <= 156 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -15530,14 +16197,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 164 /* MethodDeclaration */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 165 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 206 /* ArrowFunction */:
+            case 209 /* ArrowFunction */:
                 if (hasSyntacticModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -15551,10 +16218,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
-            case 164 /* MethodDeclaration */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
+            case 165 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasSyntacticModifier(node, 256 /* Async */);
@@ -15587,7 +16254,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        if (!(name.kind === 157 /* ComputedPropertyName */ || name.kind === 199 /* ElementAccessExpression */)) {
+        if (!(name.kind === 158 /* ComputedPropertyName */ || name.kind === 202 /* ElementAccessExpression */)) {
             return false;
         }
         var expr = ts.isElementAccessExpression(name) ? skipParentheses(name.argumentExpression) : name.expression;
@@ -15613,7 +16280,7 @@ var ts;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 157 /* ComputedPropertyName */:
+            case 158 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -15682,11 +16349,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 159 /* Parameter */;
+        return root.kind === 160 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 195 /* BindingElement */) {
+        while (node.kind === 198 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -15694,15 +16361,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 165 /* Constructor */
-            || kind === 205 /* FunctionExpression */
-            || kind === 248 /* FunctionDeclaration */
-            || kind === 206 /* ArrowFunction */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 166 /* GetAccessor */
-            || kind === 167 /* SetAccessor */
-            || kind === 253 /* ModuleDeclaration */
-            || kind === 294 /* SourceFile */;
+        return kind === 166 /* Constructor */
+            || kind === 208 /* FunctionExpression */
+            || kind === 251 /* FunctionDeclaration */
+            || kind === 209 /* ArrowFunction */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 167 /* GetAccessor */
+            || kind === 168 /* SetAccessor */
+            || kind === 256 /* ModuleDeclaration */
+            || kind === 297 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -15721,23 +16388,23 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 201 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 204 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 201 /* NewExpression */:
+            case 204 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 211 /* PrefixUnaryExpression */:
-            case 208 /* TypeOfExpression */:
-            case 209 /* VoidExpression */:
-            case 207 /* DeleteExpression */:
-            case 210 /* AwaitExpression */:
-            case 214 /* ConditionalExpression */:
-            case 216 /* YieldExpression */:
+            case 214 /* PrefixUnaryExpression */:
+            case 211 /* TypeOfExpression */:
+            case 212 /* VoidExpression */:
+            case 210 /* DeleteExpression */:
+            case 213 /* AwaitExpression */:
+            case 217 /* ConditionalExpression */:
+            case 219 /* YieldExpression */:
                 return 1 /* Right */;
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 switch (operator) {
                     case 42 /* AsteriskAsteriskToken */:
                     case 62 /* EqualsToken */:
@@ -15764,15 +16431,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 201 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 204 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 213 /* BinaryExpression */) {
+        if (expression.kind === 216 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 211 /* PrefixUnaryExpression */ || expression.kind === 212 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 214 /* PrefixUnaryExpression */ || expression.kind === 215 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -15951,15 +16618,15 @@ var ts;
     })(OperatorPrecedence = ts.OperatorPrecedence || (ts.OperatorPrecedence = {}));
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 332 /* CommaListExpression */:
+            case 337 /* CommaListExpression */:
                 return 0 /* Comma */;
-            case 217 /* SpreadElement */:
+            case 220 /* SpreadElement */:
                 return 1 /* Spread */;
-            case 216 /* YieldExpression */:
+            case 219 /* YieldExpression */:
                 return 2 /* Yield */;
-            case 214 /* ConditionalExpression */:
+            case 217 /* ConditionalExpression */:
                 return 4 /* Conditional */;
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0 /* Comma */;
@@ -15985,21 +16652,21 @@ var ts;
                 }
             // TODO: Should prefix `++` and `--` be moved to the `Update` precedence?
             // TODO: We are missing `TypeAssertionExpression`
-            case 211 /* PrefixUnaryExpression */:
-            case 208 /* TypeOfExpression */:
-            case 209 /* VoidExpression */:
-            case 207 /* DeleteExpression */:
-            case 210 /* AwaitExpression */:
+            case 214 /* PrefixUnaryExpression */:
+            case 211 /* TypeOfExpression */:
+            case 212 /* VoidExpression */:
+            case 210 /* DeleteExpression */:
+            case 213 /* AwaitExpression */:
                 return 16 /* Unary */;
-            case 212 /* PostfixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
                 return 17 /* Update */;
-            case 200 /* CallExpression */:
+            case 203 /* CallExpression */:
                 return 18 /* LeftHandSide */;
-            case 201 /* NewExpression */:
+            case 204 /* NewExpression */:
                 return hasArguments ? 19 /* Member */ : 18 /* LeftHandSide */;
-            case 202 /* TaggedTemplateExpression */:
-            case 198 /* PropertyAccessExpression */:
-            case 199 /* ElementAccessExpression */:
+            case 205 /* TaggedTemplateExpression */:
+            case 201 /* PropertyAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 return 19 /* Member */;
             case 107 /* ThisKeyword */:
             case 105 /* SuperKeyword */:
@@ -16010,19 +16677,19 @@ var ts;
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 196 /* ArrayLiteralExpression */:
-            case 197 /* ObjectLiteralExpression */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
-            case 218 /* ClassExpression */:
+            case 199 /* ArrayLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
+            case 221 /* ClassExpression */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 215 /* TemplateExpression */:
-            case 204 /* ParenthesizedExpression */:
-            case 219 /* OmittedExpression */:
-            case 270 /* JsxElement */:
-            case 271 /* JsxSelfClosingElement */:
-            case 274 /* JsxFragment */:
+            case 218 /* TemplateExpression */:
+            case 207 /* ParenthesizedExpression */:
+            case 222 /* OmittedExpression */:
+            case 273 /* JsxElement */:
+            case 274 /* JsxSelfClosingElement */:
+            case 277 /* JsxFragment */:
                 return 20 /* Primary */;
             default:
                 return -1 /* Invalid */;
@@ -16075,6 +16742,19 @@ var ts;
         return -1;
     }
     ts.getBinaryOperatorPrecedence = getBinaryOperatorPrecedence;
+    function getSemanticJsxChildren(children) {
+        return ts.filter(children, function (i) {
+            switch (i.kind) {
+                case 283 /* JsxExpression */:
+                    return !!i.expression;
+                case 11 /* JsxText */:
+                    return !i.containsOnlyTriviaWhiteSpaces;
+                default:
+                    return true;
+            }
+        });
+    }
+    ts.getSemanticJsxChildren = getSemanticJsxChildren;
     function createDiagnosticCollection() {
         var nonFileDiagnostics = []; // See GH#19873
         var filesWithDiagnostics = [];
@@ -16269,8 +16949,10 @@ var ts;
     ts.isIntrinsicJsxName = isIntrinsicJsxName;
     var indentStrings = ["", "    "];
     function getIndentString(level) {
-        if (indentStrings[level] === undefined) {
-            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
+        // prepopulate cache
+        var singleLevel = indentStrings[1];
+        for (var current = indentStrings.length; current <= level; current++) {
+            indentStrings.push(indentStrings[current - 1] + singleLevel);
         }
         return indentStrings[level];
     }
@@ -16509,6 +17191,14 @@ var ts;
         return options.outFile || options.out;
     }
     ts.outFile = outFile;
+    /** Returns 'undefined' if and only if 'options.paths' is undefined. */
+    function getPathsBasePath(options, host) {
+        var _a, _b;
+        if (!options.paths)
+            return undefined;
+        return (_a = options.baseUrl) !== null && _a !== void 0 ? _a : ts.Debug.checkDefined(options.pathsBasePath || ((_b = host.getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(host)), "Encountered 'paths' without a 'baseUrl', config file, or host 'getCurrentDirectory'.");
+    }
+    ts.getPathsBasePath = getPathsBasePath;
     /**
      * Gets the source files that are expected to have an emit output.
      *
@@ -16637,10 +17327,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 166 /* GetAccessor */) {
+            if (accessor.kind === 167 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 167 /* SetAccessor */) {
+            else if (accessor.kind === 168 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -16660,10 +17350,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 166 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 167 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 167 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 168 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -16712,7 +17402,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 === 307 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 311 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -16948,7 +17638,7 @@ var ts;
     }
     ts.getSelectedSyntacticModifierFlags = getSelectedSyntacticModifierFlags;
     function getModifierFlagsWorker(node, includeJSDoc, alwaysIncludeJSDoc) {
-        if (node.kind >= 0 /* FirstToken */ && node.kind <= 155 /* LastToken */) {
+        if (node.kind >= 0 /* FirstToken */ && node.kind <= 156 /* LastToken */) {
             return 0 /* None */;
         }
         if (!(node.modifierFlagsCache & 536870912 /* HasComputedFlags */)) {
@@ -17044,7 +17734,7 @@ var ts;
             case 84 /* ConstKeyword */: return 2048 /* Const */;
             case 87 /* DefaultKeyword */: return 512 /* Default */;
             case 129 /* AsyncKeyword */: return 256 /* Async */;
-            case 141 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 142 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -17094,8 +17784,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 197 /* ObjectLiteralExpression */
-                || kind === 196 /* ArrayLiteralExpression */;
+            return kind === 200 /* ObjectLiteralExpression */
+                || kind === 199 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -17112,12 +17802,12 @@ var ts;
         switch (node.kind) {
             case 78 /* Identifier */:
                 return node;
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 do {
                     node = node.left;
                 } while (node.kind !== 78 /* Identifier */);
                 return node;
-            case 198 /* PropertyAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
                 do {
                     node = node.expression;
                 } while (node.kind !== 78 /* Identifier */);
@@ -17127,8 +17817,8 @@ var ts;
     ts.getFirstIdentifier = getFirstIdentifier;
     function isDottedName(node) {
         return node.kind === 78 /* Identifier */ || node.kind === 107 /* ThisKeyword */ || node.kind === 105 /* SuperKeyword */ ||
-            node.kind === 198 /* PropertyAccessExpression */ && isDottedName(node.expression) ||
-            node.kind === 204 /* ParenthesizedExpression */ && isDottedName(node.expression);
+            node.kind === 201 /* PropertyAccessExpression */ && isDottedName(node.expression) ||
+            node.kind === 207 /* ParenthesizedExpression */ && isDottedName(node.expression);
     }
     ts.isDottedName = isDottedName;
     function isPropertyAccessEntityNameExpression(node) {
@@ -17153,17 +17843,17 @@ var ts;
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 156 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 157 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 201 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 197 /* ObjectLiteralExpression */ &&
+        return expression.kind === 200 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 196 /* ArrayLiteralExpression */ &&
+        return expression.kind === 199 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -17495,8 +18185,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 252 /* EnumDeclaration */:
-                case 253 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -17573,35 +18263,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 204 /* ParenthesizedExpression */:
+            case 207 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 212 /* PostfixUnaryExpression */:
-            case 211 /* PrefixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
+            case 214 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 45 /* PlusPlusToken */ || operator === 46 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
                     operatorToken.kind === 62 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 198 /* PropertyAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 285 /* PropertyAssignment */: {
+            case 288 /* 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 286 /* ShorthandPropertyAssignment */:
+            case 289 /* 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 196 /* ArrayLiteralExpression */:
+            case 199 /* 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 === 230 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 233 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -17750,37 +18440,37 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 171 /* FirstTypeNode */ && kind <= 192 /* LastTypeNode */)
+        return (kind >= 172 /* FirstTypeNode */ && kind <= 195 /* LastTypeNode */)
             || kind === 128 /* AnyKeyword */
-            || kind === 151 /* UnknownKeyword */
-            || kind === 143 /* NumberKeyword */
-            || kind === 154 /* BigIntKeyword */
-            || kind === 144 /* ObjectKeyword */
+            || kind === 152 /* UnknownKeyword */
+            || kind === 144 /* NumberKeyword */
+            || kind === 155 /* BigIntKeyword */
+            || kind === 145 /* ObjectKeyword */
             || kind === 131 /* BooleanKeyword */
-            || kind === 146 /* StringKeyword */
-            || kind === 147 /* SymbolKeyword */
+            || kind === 147 /* StringKeyword */
+            || kind === 148 /* SymbolKeyword */
             || kind === 113 /* VoidKeyword */
-            || kind === 149 /* UndefinedKeyword */
-            || kind === 140 /* NeverKeyword */
-            || kind === 220 /* ExpressionWithTypeArguments */
-            || kind === 299 /* JSDocAllType */
-            || kind === 300 /* JSDocUnknownType */
-            || kind === 301 /* JSDocNullableType */
-            || kind === 302 /* JSDocNonNullableType */
-            || kind === 303 /* JSDocOptionalType */
-            || kind === 304 /* JSDocFunctionType */
-            || kind === 305 /* JSDocVariadicType */;
+            || kind === 150 /* UndefinedKeyword */
+            || kind === 141 /* NeverKeyword */
+            || kind === 223 /* ExpressionWithTypeArguments */
+            || kind === 303 /* JSDocAllType */
+            || kind === 304 /* JSDocUnknownType */
+            || kind === 305 /* JSDocNullableType */
+            || kind === 306 /* JSDocNonNullableType */
+            || kind === 307 /* JSDocOptionalType */
+            || kind === 308 /* JSDocFunctionType */
+            || kind === 309 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 198 /* PropertyAccessExpression */ || node.kind === 199 /* ElementAccessExpression */;
+        return node.kind === 201 /* PropertyAccessExpression */ || node.kind === 202 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function getNameOfAccessExpression(node) {
-        if (node.kind === 198 /* PropertyAccessExpression */) {
+        if (node.kind === 201 /* PropertyAccessExpression */) {
             return node.name;
         }
-        ts.Debug.assert(node.kind === 199 /* ElementAccessExpression */);
+        ts.Debug.assert(node.kind === 202 /* ElementAccessExpression */);
         return node.argumentExpression;
     }
     ts.getNameOfAccessExpression = getNameOfAccessExpression;
@@ -17795,34 +18485,41 @@ var ts;
     }
     ts.isBundleFileTextLike = isBundleFileTextLike;
     function isNamedImportsOrExports(node) {
-        return node.kind === 261 /* NamedImports */ || node.kind === 265 /* NamedExports */;
+        return node.kind === 264 /* NamedImports */ || node.kind === 268 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
+    function getLeftmostAccessExpression(expr) {
+        while (isAccessExpression(expr)) {
+            expr = expr.expression;
+        }
+        return expr;
+    }
+    ts.getLeftmostAccessExpression = getLeftmostAccessExpression;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 212 /* PostfixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 221 /* AsExpression */:
-                case 199 /* ElementAccessExpression */:
-                case 198 /* PropertyAccessExpression */:
-                case 222 /* NonNullExpression */:
-                case 331 /* PartiallyEmittedExpression */:
+                case 224 /* AsExpression */:
+                case 202 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 225 /* NonNullExpression */:
+                case 336 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -17841,7 +18538,7 @@ var ts;
     }
     function Type(checker, flags) {
         this.flags = flags;
-        if (ts.Debug.isDebugging) {
+        if (ts.Debug.isDebugging || ts.tracing.isTracing()) {
             this.checker = checker;
         }
     }
@@ -18198,6 +18895,10 @@ var ts;
         return compilerOptions[flag] === undefined ? !!compilerOptions.strict : !!compilerOptions[flag];
     }
     ts.getStrictOptionValue = getStrictOptionValue;
+    function getAllowJSCompilerOption(compilerOptions) {
+        return compilerOptions.allowJs === undefined ? !!compilerOptions.checkJs : compilerOptions.allowJs;
+    }
+    ts.getAllowJSCompilerOption = getAllowJSCompilerOption;
     function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
         return oldOptions !== newOptions &&
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
@@ -18212,6 +18913,26 @@ var ts;
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
     ts.getCompilerOptionValue = getCompilerOptionValue;
+    function getJSXTransformEnabled(options) {
+        var jsx = options.jsx;
+        return jsx === 2 /* React */ || jsx === 4 /* ReactJSX */ || jsx === 5 /* ReactJSXDev */;
+    }
+    ts.getJSXTransformEnabled = getJSXTransformEnabled;
+    function getJSXImplicitImportBase(compilerOptions, file) {
+        var jsxImportSourcePragmas = file === null || file === void 0 ? void 0 : file.pragmas.get("jsximportsource");
+        var jsxImportSourcePragma = ts.isArray(jsxImportSourcePragmas) ? jsxImportSourcePragmas[0] : jsxImportSourcePragmas;
+        return compilerOptions.jsx === 4 /* ReactJSX */ ||
+            compilerOptions.jsx === 5 /* ReactJSXDev */ ||
+            compilerOptions.jsxImportSource ||
+            jsxImportSourcePragma ?
+            (jsxImportSourcePragma === null || jsxImportSourcePragma === void 0 ? void 0 : jsxImportSourcePragma.arguments.factory) || compilerOptions.jsxImportSource || "react" :
+            undefined;
+    }
+    ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
+    function getJSXRuntimeImport(base, options) {
+        return base ? base + "/" + (options.jsx === 5 /* ReactJSXDev */ ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
+    }
+    ts.getJSXRuntimeImport = getJSXRuntimeImport;
     function hasZeroOrOneAsteriskCharacter(str) {
         var seenAsterisk = false;
         for (var i = 0; i < str.length; i++) {
@@ -18591,7 +19312,7 @@ var ts;
     var allSupportedExtensions = __spreadArrays(ts.supportedTSExtensions, ts.supportedJSExtensions);
     var allSupportedExtensionsWithJson = __spreadArrays(ts.supportedTSExtensions, ts.supportedJSExtensions, [".json" /* Json */]);
     function getSupportedExtensions(options, extraFileExtensions) {
-        var needJsExtensions = options && options.allowJs;
+        var needJsExtensions = options && getAllowJSCompilerOption(options);
         if (!extraFileExtensions || extraFileExtensions.length === 0) {
             return needJsExtensions ? allSupportedExtensions : ts.supportedTSExtensions;
         }
@@ -18802,6 +19523,7 @@ var ts;
         if (!diagnostic.relatedInformation) {
             diagnostic.relatedInformation = [];
         }
+        ts.Debug.assert(diagnostic.relatedInformation !== ts.emptyArray, "Diagnostic had empty array singleton for related info, but is still being constructed!");
         (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
         return diagnostic;
     }
@@ -18930,38 +19652,38 @@ var ts;
     }
     ts.isValidTypeOnlyAliasUseSite = isValidTypeOnlyAliasUseSite;
     function typeOnlyDeclarationIsExport(typeOnlyDeclaration) {
-        return typeOnlyDeclaration.kind === 267 /* ExportSpecifier */;
+        return typeOnlyDeclaration.kind === 270 /* ExportSpecifier */;
     }
     ts.typeOnlyDeclarationIsExport = typeOnlyDeclarationIsExport;
     function isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(node) {
-        while (node.kind === 78 /* Identifier */ || node.kind === 198 /* PropertyAccessExpression */) {
+        while (node.kind === 78 /* Identifier */ || node.kind === 201 /* PropertyAccessExpression */) {
             node = node.parent;
         }
-        if (node.kind !== 157 /* ComputedPropertyName */) {
+        if (node.kind !== 158 /* ComputedPropertyName */) {
             return false;
         }
         if (hasSyntacticModifier(node.parent, 128 /* Abstract */)) {
             return true;
         }
         var containerKind = node.parent.parent.kind;
-        return containerKind === 250 /* InterfaceDeclaration */ || containerKind === 176 /* TypeLiteral */;
+        return containerKind === 253 /* InterfaceDeclaration */ || containerKind === 177 /* TypeLiteral */;
     }
     /** Returns true for an identifier in 1) an `implements` clause, and 2) an `extends` clause of an interface. */
     function isIdentifierInNonEmittingHeritageClause(node) {
         if (node.kind !== 78 /* Identifier */)
             return false;
-        var heritageClause = findAncestor(node.parent, function (parent) {
+        var heritageClause = ts.findAncestor(node.parent, function (parent) {
             switch (parent.kind) {
-                case 283 /* HeritageClause */:
+                case 286 /* HeritageClause */:
                     return true;
-                case 198 /* PropertyAccessExpression */:
-                case 220 /* ExpressionWithTypeArguments */:
+                case 201 /* PropertyAccessExpression */:
+                case 223 /* ExpressionWithTypeArguments */:
                     return false;
                 default:
                     return "quit";
             }
         });
-        return (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.token) === 116 /* ImplementsKeyword */ || (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.parent.kind) === 250 /* InterfaceDeclaration */;
+        return (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.token) === 116 /* ImplementsKeyword */ || (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.parent.kind) === 253 /* InterfaceDeclaration */;
     }
     function isIdentifierTypeReference(node) {
         return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName);
@@ -19155,10 +19877,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(213 /* BinaryExpression */, binaryOperator);
-            var binaryOperatorAssociativity = ts.getOperatorAssociativity(213 /* BinaryExpression */, binaryOperator);
+            var binaryOperatorPrecedence = ts.getOperatorPrecedence(216 /* BinaryExpression */, binaryOperator);
+            var binaryOperatorAssociativity = ts.getOperatorAssociativity(216 /* BinaryExpression */, binaryOperator);
             var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-            if (!isLeftSideOfBinary && operand.kind === 206 /* ArrowFunction */ && binaryOperatorPrecedence > 3 /* Assignment */) {
+            if (!isLeftSideOfBinary && operand.kind === 209 /* ArrowFunction */ && binaryOperatorPrecedence > 3 /* Assignment */) {
                 // We need to parenthesize arrow functions on the right side to avoid it being
                 // parsed as parenthesized expression: `a && (() => {})`
                 return true;
@@ -19170,7 +19892,7 @@ var ts;
                     // and is a yield expression, then we do not need parentheses.
                     if (!isLeftSideOfBinary
                         && binaryOperatorAssociativity === 1 /* Right */
-                        && operand.kind === 216 /* YieldExpression */) {
+                        && operand.kind === 219 /* YieldExpression */) {
                         return false;
                     }
                     return true;
@@ -19258,7 +19980,7 @@ var ts;
             if (ts.isLiteralKind(node.kind)) {
                 return node.kind;
             }
-            if (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) {
+            if (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) {
                 if (node.cachedLiteralKind !== undefined) {
                     return node.cachedLiteralKind;
                 }
@@ -19284,7 +20006,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 === 204 /* ParenthesizedExpression */) {
+            if (skipped.kind === 207 /* ParenthesizedExpression */) {
                 return operand;
             }
             return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -19301,7 +20023,7 @@ var ts;
             return ts.isCommaSequence(expression) ? factory.createParenthesizedExpression(expression) : expression;
         }
         function parenthesizeConditionOfConditionalExpression(condition) {
-            var conditionalPrecedence = ts.getOperatorPrecedence(214 /* ConditionalExpression */, 57 /* QuestionToken */);
+            var conditionalPrecedence = ts.getOperatorPrecedence(217 /* ConditionalExpression */, 57 /* QuestionToken */);
             var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
             var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
             if (ts.compareValues(conditionPrecedence, conditionalPrecedence) !== 1 /* GreaterThan */) {
@@ -19334,8 +20056,8 @@ var ts;
             var needsParens = ts.isCommaSequence(check);
             if (!needsParens) {
                 switch (ts.getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                    case 218 /* ClassExpression */:
-                    case 205 /* FunctionExpression */:
+                    case 221 /* ClassExpression */:
+                    case 208 /* FunctionExpression */:
                         needsParens = true;
                 }
             }
@@ -19348,9 +20070,9 @@ var ts;
         function parenthesizeExpressionOfNew(expression) {
             var leftmostExpr = ts.getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
             switch (leftmostExpr.kind) {
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return factory.createParenthesizedExpression(expression);
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return !leftmostExpr.arguments
                         ? factory.createParenthesizedExpression(expression)
                         : expression; // TODO(rbuckton): Verify this assertion holds
@@ -19370,7 +20092,7 @@ var ts;
             //
             var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
             if (ts.isLeftHandSideExpression(emittedExpression)
-                && (emittedExpression.kind !== 201 /* NewExpression */ || emittedExpression.arguments)) {
+                && (emittedExpression.kind !== 204 /* NewExpression */ || emittedExpression.arguments)) {
                 // TODO(rbuckton): Verify whether this assertion holds.
                 return expression;
             }
@@ -19392,7 +20114,7 @@ var ts;
         function parenthesizeExpressionForDisallowedComma(expression) {
             var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
             var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-            var commaPrecedence = ts.getOperatorPrecedence(213 /* BinaryExpression */, 27 /* CommaToken */);
+            var commaPrecedence = ts.getOperatorPrecedence(216 /* BinaryExpression */, 27 /* CommaToken */);
             // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
             return expressionPrecedence > commaPrecedence ? expression : ts.setTextRange(factory.createParenthesizedExpression(expression), expression);
         }
@@ -19401,44 +20123,44 @@ var ts;
             if (ts.isCallExpression(emittedExpression)) {
                 var callee = emittedExpression.expression;
                 var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-                if (kind === 205 /* FunctionExpression */ || kind === 206 /* ArrowFunction */) {
+                if (kind === 208 /* FunctionExpression */ || kind === 209 /* ArrowFunction */) {
                     // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
                     var updated = factory.updateCallExpression(emittedExpression, ts.setTextRange(factory.createParenthesizedExpression(callee), callee), emittedExpression.typeArguments, emittedExpression.arguments);
                     return factory.restoreOuterExpressions(expression, updated, 8 /* PartiallyEmittedExpressions */);
                 }
             }
             var leftmostExpressionKind = ts.getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-            if (leftmostExpressionKind === 197 /* ObjectLiteralExpression */ || leftmostExpressionKind === 205 /* FunctionExpression */) {
+            if (leftmostExpressionKind === 200 /* ObjectLiteralExpression */ || leftmostExpressionKind === 208 /* FunctionExpression */) {
                 // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
                 return ts.setTextRange(factory.createParenthesizedExpression(expression), expression);
             }
             return expression;
         }
         function parenthesizeConciseBodyOfArrowFunction(body) {
-            if (!ts.isBlock(body) && (ts.isCommaSequence(body) || ts.getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 197 /* ObjectLiteralExpression */)) {
+            if (!ts.isBlock(body) && (ts.isCommaSequence(body) || ts.getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 200 /* ObjectLiteralExpression */)) {
                 // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
                 return ts.setTextRange(factory.createParenthesizedExpression(body), body);
             }
             return body;
         }
         function parenthesizeMemberOfConditionalType(member) {
-            return member.kind === 183 /* ConditionalType */ ? factory.createParenthesizedType(member) : member;
+            return member.kind === 184 /* ConditionalType */ ? factory.createParenthesizedType(member) : member;
         }
         function parenthesizeMemberOfElementType(member) {
             switch (member.kind) {
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
-                case 173 /* FunctionType */:
-                case 174 /* ConstructorType */:
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */:
                     return factory.createParenthesizedType(member);
             }
             return parenthesizeMemberOfConditionalType(member);
         }
         function parenthesizeElementTypeOfArrayType(member) {
             switch (member.kind) {
-                case 175 /* TypeQuery */:
-                case 187 /* TypeOperator */:
-                case 184 /* InferType */:
+                case 176 /* TypeQuery */:
+                case 188 /* TypeOperator */:
+                case 185 /* InferType */:
                     return factory.createParenthesizedType(member);
             }
             return parenthesizeMemberOfElementType(member);
@@ -19542,11 +20264,11 @@ var ts;
         }
         function convertToAssignmentPattern(node) {
             switch (node.kind) {
-                case 194 /* ArrayBindingPattern */:
-                case 196 /* ArrayLiteralExpression */:
+                case 197 /* ArrayBindingPattern */:
+                case 199 /* ArrayLiteralExpression */:
                     return convertToArrayAssignmentPattern(node);
-                case 193 /* ObjectBindingPattern */:
-                case 197 /* ObjectLiteralExpression */:
+                case 196 /* ObjectBindingPattern */:
+                case 200 /* ObjectLiteralExpression */:
                     return convertToObjectAssignmentPattern(node);
             }
         }
@@ -19674,6 +20396,8 @@ var ts;
             updateConstructSignature: updateConstructSignature,
             createIndexSignature: createIndexSignature,
             updateIndexSignature: updateIndexSignature,
+            createTemplateLiteralTypeSpan: createTemplateLiteralTypeSpan,
+            updateTemplateLiteralTypeSpan: updateTemplateLiteralTypeSpan,
             createKeywordTypeNode: createKeywordTypeNode,
             createTypePredicateNode: createTypePredicateNode,
             updateTypePredicateNode: updateTypePredicateNode,
@@ -19718,6 +20442,8 @@ var ts;
             updateMappedTypeNode: updateMappedTypeNode,
             createLiteralTypeNode: createLiteralTypeNode,
             updateLiteralTypeNode: updateLiteralTypeNode,
+            createTemplateLiteralType: createTemplateLiteralType,
+            updateTemplateLiteralType: updateTemplateLiteralType,
             createObjectBindingPattern: createObjectBindingPattern,
             updateObjectBindingPattern: updateObjectBindingPattern,
             createArrayBindingPattern: createArrayBindingPattern,
@@ -19883,18 +20609,18 @@ var ts;
             createExternalModuleReference: createExternalModuleReference,
             updateExternalModuleReference: updateExternalModuleReference,
             // lazily load factory members for JSDoc types with similar structure
-            get createJSDocAllType() { return getJSDocPrimaryTypeCreateFunction(299 /* JSDocAllType */); },
-            get createJSDocUnknownType() { return getJSDocPrimaryTypeCreateFunction(300 /* JSDocUnknownType */); },
-            get createJSDocNonNullableType() { return getJSDocUnaryTypeCreateFunction(302 /* JSDocNonNullableType */); },
-            get updateJSDocNonNullableType() { return getJSDocUnaryTypeUpdateFunction(302 /* JSDocNonNullableType */); },
-            get createJSDocNullableType() { return getJSDocUnaryTypeCreateFunction(301 /* JSDocNullableType */); },
-            get updateJSDocNullableType() { return getJSDocUnaryTypeUpdateFunction(301 /* JSDocNullableType */); },
-            get createJSDocOptionalType() { return getJSDocUnaryTypeCreateFunction(303 /* JSDocOptionalType */); },
-            get updateJSDocOptionalType() { return getJSDocUnaryTypeUpdateFunction(303 /* JSDocOptionalType */); },
-            get createJSDocVariadicType() { return getJSDocUnaryTypeCreateFunction(305 /* JSDocVariadicType */); },
-            get updateJSDocVariadicType() { return getJSDocUnaryTypeUpdateFunction(305 /* JSDocVariadicType */); },
-            get createJSDocNamepathType() { return getJSDocUnaryTypeCreateFunction(306 /* JSDocNamepathType */); },
-            get updateJSDocNamepathType() { return getJSDocUnaryTypeUpdateFunction(306 /* JSDocNamepathType */); },
+            get createJSDocAllType() { return getJSDocPrimaryTypeCreateFunction(303 /* JSDocAllType */); },
+            get createJSDocUnknownType() { return getJSDocPrimaryTypeCreateFunction(304 /* JSDocUnknownType */); },
+            get createJSDocNonNullableType() { return getJSDocUnaryTypeCreateFunction(306 /* JSDocNonNullableType */); },
+            get updateJSDocNonNullableType() { return getJSDocUnaryTypeUpdateFunction(306 /* JSDocNonNullableType */); },
+            get createJSDocNullableType() { return getJSDocUnaryTypeCreateFunction(305 /* JSDocNullableType */); },
+            get updateJSDocNullableType() { return getJSDocUnaryTypeUpdateFunction(305 /* JSDocNullableType */); },
+            get createJSDocOptionalType() { return getJSDocUnaryTypeCreateFunction(307 /* JSDocOptionalType */); },
+            get updateJSDocOptionalType() { return getJSDocUnaryTypeUpdateFunction(307 /* JSDocOptionalType */); },
+            get createJSDocVariadicType() { return getJSDocUnaryTypeCreateFunction(309 /* JSDocVariadicType */); },
+            get updateJSDocVariadicType() { return getJSDocUnaryTypeUpdateFunction(309 /* JSDocVariadicType */); },
+            get createJSDocNamepathType() { return getJSDocUnaryTypeCreateFunction(310 /* JSDocNamepathType */); },
+            get updateJSDocNamepathType() { return getJSDocUnaryTypeUpdateFunction(310 /* JSDocNamepathType */); },
             createJSDocFunctionType: createJSDocFunctionType,
             updateJSDocFunctionType: updateJSDocFunctionType,
             createJSDocTypeLiteral: createJSDocTypeLiteral,
@@ -19917,29 +20643,33 @@ var ts;
             updateJSDocAugmentsTag: updateJSDocAugmentsTag,
             createJSDocImplementsTag: createJSDocImplementsTag,
             updateJSDocImplementsTag: updateJSDocImplementsTag,
+            createJSDocSeeTag: createJSDocSeeTag,
+            updateJSDocSeeTag: updateJSDocSeeTag,
+            createJSDocNameReference: createJSDocNameReference,
+            updateJSDocNameReference: updateJSDocNameReference,
             // lazily load factory members for JSDoc tags with similar structure
-            get createJSDocTypeTag() { return getJSDocTypeLikeTagCreateFunction(325 /* JSDocTypeTag */); },
-            get updateJSDocTypeTag() { return getJSDocTypeLikeTagUpdateFunction(325 /* JSDocTypeTag */); },
-            get createJSDocReturnTag() { return getJSDocTypeLikeTagCreateFunction(323 /* JSDocReturnTag */); },
-            get updateJSDocReturnTag() { return getJSDocTypeLikeTagUpdateFunction(323 /* JSDocReturnTag */); },
-            get createJSDocThisTag() { return getJSDocTypeLikeTagCreateFunction(324 /* JSDocThisTag */); },
-            get updateJSDocThisTag() { return getJSDocTypeLikeTagUpdateFunction(324 /* JSDocThisTag */); },
-            get createJSDocEnumTag() { return getJSDocTypeLikeTagCreateFunction(321 /* JSDocEnumTag */); },
-            get updateJSDocEnumTag() { return getJSDocTypeLikeTagUpdateFunction(321 /* JSDocEnumTag */); },
-            get createJSDocAuthorTag() { return getJSDocSimpleTagCreateFunction(313 /* JSDocAuthorTag */); },
-            get updateJSDocAuthorTag() { return getJSDocSimpleTagUpdateFunction(313 /* JSDocAuthorTag */); },
-            get createJSDocClassTag() { return getJSDocSimpleTagCreateFunction(315 /* JSDocClassTag */); },
-            get updateJSDocClassTag() { return getJSDocSimpleTagUpdateFunction(315 /* JSDocClassTag */); },
-            get createJSDocPublicTag() { return getJSDocSimpleTagCreateFunction(316 /* JSDocPublicTag */); },
-            get updateJSDocPublicTag() { return getJSDocSimpleTagUpdateFunction(316 /* JSDocPublicTag */); },
-            get createJSDocPrivateTag() { return getJSDocSimpleTagCreateFunction(317 /* JSDocPrivateTag */); },
-            get updateJSDocPrivateTag() { return getJSDocSimpleTagUpdateFunction(317 /* JSDocPrivateTag */); },
-            get createJSDocProtectedTag() { return getJSDocSimpleTagCreateFunction(318 /* JSDocProtectedTag */); },
-            get updateJSDocProtectedTag() { return getJSDocSimpleTagUpdateFunction(318 /* JSDocProtectedTag */); },
-            get createJSDocReadonlyTag() { return getJSDocSimpleTagCreateFunction(319 /* JSDocReadonlyTag */); },
-            get updateJSDocReadonlyTag() { return getJSDocSimpleTagUpdateFunction(319 /* JSDocReadonlyTag */); },
-            get createJSDocDeprecatedTag() { return getJSDocSimpleTagCreateFunction(314 /* JSDocDeprecatedTag */); },
-            get updateJSDocDeprecatedTag() { return getJSDocSimpleTagUpdateFunction(314 /* JSDocDeprecatedTag */); },
+            get createJSDocTypeTag() { return getJSDocTypeLikeTagCreateFunction(329 /* JSDocTypeTag */); },
+            get updateJSDocTypeTag() { return getJSDocTypeLikeTagUpdateFunction(329 /* JSDocTypeTag */); },
+            get createJSDocReturnTag() { return getJSDocTypeLikeTagCreateFunction(327 /* JSDocReturnTag */); },
+            get updateJSDocReturnTag() { return getJSDocTypeLikeTagUpdateFunction(327 /* JSDocReturnTag */); },
+            get createJSDocThisTag() { return getJSDocTypeLikeTagCreateFunction(328 /* JSDocThisTag */); },
+            get updateJSDocThisTag() { return getJSDocTypeLikeTagUpdateFunction(328 /* JSDocThisTag */); },
+            get createJSDocEnumTag() { return getJSDocTypeLikeTagCreateFunction(325 /* JSDocEnumTag */); },
+            get updateJSDocEnumTag() { return getJSDocTypeLikeTagUpdateFunction(325 /* JSDocEnumTag */); },
+            get createJSDocAuthorTag() { return getJSDocSimpleTagCreateFunction(317 /* JSDocAuthorTag */); },
+            get updateJSDocAuthorTag() { return getJSDocSimpleTagUpdateFunction(317 /* JSDocAuthorTag */); },
+            get createJSDocClassTag() { return getJSDocSimpleTagCreateFunction(319 /* JSDocClassTag */); },
+            get updateJSDocClassTag() { return getJSDocSimpleTagUpdateFunction(319 /* JSDocClassTag */); },
+            get createJSDocPublicTag() { return getJSDocSimpleTagCreateFunction(320 /* JSDocPublicTag */); },
+            get updateJSDocPublicTag() { return getJSDocSimpleTagUpdateFunction(320 /* JSDocPublicTag */); },
+            get createJSDocPrivateTag() { return getJSDocSimpleTagCreateFunction(321 /* JSDocPrivateTag */); },
+            get updateJSDocPrivateTag() { return getJSDocSimpleTagUpdateFunction(321 /* JSDocPrivateTag */); },
+            get createJSDocProtectedTag() { return getJSDocSimpleTagCreateFunction(322 /* JSDocProtectedTag */); },
+            get updateJSDocProtectedTag() { return getJSDocSimpleTagUpdateFunction(322 /* JSDocProtectedTag */); },
+            get createJSDocReadonlyTag() { return getJSDocSimpleTagCreateFunction(323 /* JSDocReadonlyTag */); },
+            get updateJSDocReadonlyTag() { return getJSDocSimpleTagUpdateFunction(323 /* JSDocReadonlyTag */); },
+            get createJSDocDeprecatedTag() { return getJSDocSimpleTagCreateFunction(318 /* JSDocDeprecatedTag */); },
+            get updateJSDocDeprecatedTag() { return getJSDocSimpleTagUpdateFunction(318 /* JSDocDeprecatedTag */); },
             createJSDocUnknownTag: createJSDocUnknownTag,
             updateJSDocUnknownTag: updateJSDocUnknownTag,
             createJSDocComment: createJSDocComment,
@@ -20084,6 +20814,7 @@ var ts;
                 if (elements.transformFlags === undefined) {
                     aggregateChildrenFlags(elements);
                 }
+                ts.Debug.attachNodeArrayDebugInfo(elements);
                 return elements;
             }
             // Since the element list of a node array is typically created by starting with an empty array and
@@ -20094,6 +20825,7 @@ var ts;
             ts.setTextRangePosEnd(array, -1, -1);
             array.hasTrailingComma = !!hasTrailingComma;
             aggregateChildrenFlags(array);
+            ts.Debug.attachNodeArrayDebugInfo(array);
             return array;
         }
         function createBaseNode(kind) {
@@ -20123,11 +20855,11 @@ var ts;
             // don't propagate child flags.
             if (name) {
                 switch (node.kind) {
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 162 /* PropertyDeclaration */:
-                    case 285 /* PropertyAssignment */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 163 /* PropertyDeclaration */:
+                    case 288 /* PropertyAssignment */:
                         if (ts.isIdentifier(name)) {
                             node.transformFlags |= propagateIdentifierNameFlags(name);
                             break;
@@ -20355,7 +21087,7 @@ var ts;
             return baseFactory.createBaseTokenNode(kind);
         }
         function createToken(token) {
-            ts.Debug.assert(token >= 0 /* FirstToken */ && token <= 155 /* LastToken */, "Invalid token");
+            ts.Debug.assert(token >= 0 /* FirstToken */ && token <= 156 /* LastToken */, "Invalid token");
             ts.Debug.assert(token <= 14 /* FirstTemplateToken */ || token >= 17 /* LastTemplateToken */, "Invalid token. Use 'createTemplateLiteralLikeNode' to create template literals.");
             ts.Debug.assert(token <= 8 /* FirstLiteralToken */ || token >= 14 /* LastLiteralToken */, "Invalid token. Use 'createLiteralLikeNode' to create literals.");
             ts.Debug.assert(token !== 78 /* Identifier */, "Invalid token. Use 'createIdentifier' to create identifiers");
@@ -20371,21 +21103,21 @@ var ts;
                 case 122 /* PublicKeyword */:
                 case 120 /* PrivateKeyword */:
                 case 121 /* ProtectedKeyword */:
-                case 141 /* ReadonlyKeyword */:
+                case 142 /* ReadonlyKeyword */:
                 case 125 /* AbstractKeyword */:
                 case 133 /* DeclareKeyword */:
                 case 84 /* ConstKeyword */:
                 case 128 /* AnyKeyword */:
-                case 143 /* NumberKeyword */:
-                case 154 /* BigIntKeyword */:
-                case 140 /* NeverKeyword */:
-                case 144 /* ObjectKeyword */:
-                case 146 /* StringKeyword */:
+                case 144 /* NumberKeyword */:
+                case 155 /* BigIntKeyword */:
+                case 141 /* NeverKeyword */:
+                case 145 /* ObjectKeyword */:
+                case 147 /* StringKeyword */:
                 case 131 /* BooleanKeyword */:
-                case 147 /* SymbolKeyword */:
+                case 148 /* SymbolKeyword */:
                 case 113 /* VoidKeyword */:
-                case 151 /* UnknownKeyword */:
-                case 149 /* UndefinedKeyword */: // `undefined` is an Identifier in the expression case.
+                case 152 /* UnknownKeyword */:
+                case 150 /* UndefinedKeyword */: // `undefined` is an Identifier in the expression case.
                     transformFlags = 1 /* ContainsTypeScript */;
                     break;
                 case 123 /* StaticKeyword */:
@@ -20463,7 +21195,7 @@ var ts;
                 result.push(createModifier(123 /* StaticKeyword */));
             }
             if (flags & 64 /* Readonly */) {
-                result.push(createModifier(141 /* ReadonlyKeyword */));
+                result.push(createModifier(142 /* ReadonlyKeyword */));
             }
             if (flags & 256 /* Async */) {
                 result.push(createModifier(129 /* AsyncKeyword */));
@@ -20475,7 +21207,7 @@ var ts;
         //
         // @api
         function createQualifiedName(left, right) {
-            var node = createBaseNode(156 /* QualifiedName */);
+            var node = createBaseNode(157 /* QualifiedName */);
             node.left = left;
             node.right = asName(right);
             node.transformFlags |=
@@ -20492,7 +21224,7 @@ var ts;
         }
         // @api
         function createComputedPropertyName(expression) {
-            var node = createBaseNode(157 /* ComputedPropertyName */);
+            var node = createBaseNode(158 /* ComputedPropertyName */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfComputedPropertyName(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -20511,7 +21243,7 @@ var ts;
         //
         // @api
         function createTypeParameterDeclaration(name, constraint, defaultType) {
-            var node = createBaseNamedDeclaration(158 /* TypeParameter */, 
+            var node = createBaseNamedDeclaration(159 /* TypeParameter */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.constraint = constraint;
@@ -20529,7 +21261,7 @@ var ts;
         }
         // @api
         function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(159 /* Parameter */, decorators, modifiers, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
+            var node = createBaseVariableLikeDeclaration(160 /* Parameter */, decorators, modifiers, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
             node.dotDotDotToken = dotDotDotToken;
             node.questionToken = questionToken;
             if (ts.isThisIdentifier(node.name)) {
@@ -20562,7 +21294,7 @@ var ts;
         }
         // @api
         function createDecorator(expression) {
-            var node = createBaseNode(160 /* Decorator */);
+            var node = createBaseNode(161 /* Decorator */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -20581,7 +21313,7 @@ var ts;
         //
         // @api
         function createPropertySignature(modifiers, name, questionToken, type) {
-            var node = createBaseNamedDeclaration(161 /* PropertySignature */, 
+            var node = createBaseNamedDeclaration(162 /* PropertySignature */, 
             /*decorators*/ undefined, modifiers, name);
             node.type = type;
             node.questionToken = questionToken;
@@ -20599,7 +21331,7 @@ var ts;
         }
         // @api
         function createPropertyDeclaration(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(162 /* PropertyDeclaration */, decorators, modifiers, name, type, initializer);
+            var node = createBaseVariableLikeDeclaration(163 /* PropertyDeclaration */, decorators, modifiers, name, type, initializer);
             node.questionToken = questionOrExclamationToken && ts.isQuestionToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined;
             node.exclamationToken = questionOrExclamationToken && ts.isExclamationToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined;
             node.transformFlags |=
@@ -20628,7 +21360,7 @@ var ts;
         }
         // @api
         function createMethodSignature(modifiers, name, questionToken, typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(163 /* MethodSignature */, 
+            var node = createBaseSignatureDeclaration(164 /* MethodSignature */, 
             /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type);
             node.questionToken = questionToken;
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -20647,7 +21379,7 @@ var ts;
         }
         // @api
         function createMethodDeclaration(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(164 /* MethodDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
+            var node = createBaseFunctionLikeDeclaration(165 /* MethodDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             node.questionToken = questionToken;
             node.transformFlags |=
@@ -20686,7 +21418,7 @@ var ts;
         }
         // @api
         function createConstructorDeclaration(decorators, modifiers, parameters, body) {
-            var node = createBaseFunctionLikeDeclaration(165 /* Constructor */, decorators, modifiers, 
+            var node = createBaseFunctionLikeDeclaration(166 /* Constructor */, decorators, modifiers, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, parameters, 
             /*type*/ undefined, body);
@@ -20704,7 +21436,7 @@ var ts;
         }
         // @api
         function createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body) {
-            return createBaseFunctionLikeDeclaration(166 /* GetAccessor */, decorators, modifiers, name, 
+            return createBaseFunctionLikeDeclaration(167 /* GetAccessor */, decorators, modifiers, name, 
             /*typeParameters*/ undefined, parameters, type, body);
         }
         // @api
@@ -20720,7 +21452,7 @@ var ts;
         }
         // @api
         function createSetAccessorDeclaration(decorators, modifiers, name, parameters, body) {
-            return createBaseFunctionLikeDeclaration(167 /* SetAccessor */, decorators, modifiers, name, 
+            return createBaseFunctionLikeDeclaration(168 /* SetAccessor */, decorators, modifiers, name, 
             /*typeParameters*/ undefined, parameters, 
             /*type*/ undefined, body);
         }
@@ -20736,7 +21468,7 @@ var ts;
         }
         // @api
         function createCallSignature(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(168 /* CallSignature */, 
+            var node = createBaseSignatureDeclaration(169 /* CallSignature */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -20753,7 +21485,7 @@ var ts;
         }
         // @api
         function createConstructSignature(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(169 /* ConstructSignature */, 
+            var node = createBaseSignatureDeclaration(170 /* ConstructSignature */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -20770,7 +21502,7 @@ var ts;
         }
         // @api
         function createIndexSignature(decorators, modifiers, parameters, type) {
-            var node = createBaseSignatureDeclaration(170 /* IndexSignature */, decorators, modifiers, 
+            var node = createBaseSignatureDeclaration(171 /* IndexSignature */, decorators, modifiers, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, parameters, type);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -20785,6 +21517,21 @@ var ts;
                 ? updateBaseSignatureDeclaration(createIndexSignature(decorators, modifiers, parameters, type), node)
                 : node;
         }
+        // @api
+        function createTemplateLiteralTypeSpan(type, literal) {
+            var node = createBaseNode(194 /* TemplateLiteralTypeSpan */);
+            node.type = type;
+            node.literal = literal;
+            node.transformFlags = 1 /* ContainsTypeScript */;
+            return node;
+        }
+        // @api
+        function updateTemplateLiteralTypeSpan(node, type, literal) {
+            return node.type !== type
+                || node.literal !== literal
+                ? update(createTemplateLiteralTypeSpan(type, literal), node)
+                : node;
+        }
         //
         // Types
         //
@@ -20794,7 +21541,7 @@ var ts;
         }
         // @api
         function createTypePredicateNode(assertsModifier, parameterName, type) {
-            var node = createBaseNode(171 /* TypePredicate */);
+            var node = createBaseNode(172 /* TypePredicate */);
             node.assertsModifier = assertsModifier;
             node.parameterName = asName(parameterName);
             node.type = type;
@@ -20811,7 +21558,7 @@ var ts;
         }
         // @api
         function createTypeReferenceNode(typeName, typeArguments) {
-            var node = createBaseNode(172 /* TypeReference */);
+            var node = createBaseNode(173 /* TypeReference */);
             node.typeName = asName(typeName);
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(createNodeArray(typeArguments));
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -20826,7 +21573,7 @@ var ts;
         }
         // @api
         function createFunctionTypeNode(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(173 /* FunctionType */, 
+            var node = createBaseSignatureDeclaration(174 /* FunctionType */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -20843,7 +21590,7 @@ var ts;
         }
         // @api
         function createConstructorTypeNode(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(174 /* ConstructorType */, 
+            var node = createBaseSignatureDeclaration(175 /* ConstructorType */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -20860,7 +21607,7 @@ var ts;
         }
         // @api
         function createTypeQueryNode(exprName) {
-            var node = createBaseNode(175 /* TypeQuery */);
+            var node = createBaseNode(176 /* TypeQuery */);
             node.exprName = exprName;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20873,7 +21620,7 @@ var ts;
         }
         // @api
         function createTypeLiteralNode(members) {
-            var node = createBaseNode(176 /* TypeLiteral */);
+            var node = createBaseNode(177 /* TypeLiteral */);
             node.members = createNodeArray(members);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20886,7 +21633,7 @@ var ts;
         }
         // @api
         function createArrayTypeNode(elementType) {
-            var node = createBaseNode(177 /* ArrayType */);
+            var node = createBaseNode(178 /* ArrayType */);
             node.elementType = parenthesizerRules().parenthesizeElementTypeOfArrayType(elementType);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20899,7 +21646,7 @@ var ts;
         }
         // @api
         function createTupleTypeNode(elements) {
-            var node = createBaseNode(178 /* TupleType */);
+            var node = createBaseNode(179 /* TupleType */);
             node.elements = createNodeArray(elements);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20912,7 +21659,7 @@ var ts;
         }
         // @api
         function createNamedTupleMember(dotDotDotToken, name, questionToken, type) {
-            var node = createBaseNode(191 /* NamedTupleMember */);
+            var node = createBaseNode(192 /* NamedTupleMember */);
             node.dotDotDotToken = dotDotDotToken;
             node.name = name;
             node.questionToken = questionToken;
@@ -20931,7 +21678,7 @@ var ts;
         }
         // @api
         function createOptionalTypeNode(type) {
-            var node = createBaseNode(179 /* OptionalType */);
+            var node = createBaseNode(180 /* OptionalType */);
             node.type = parenthesizerRules().parenthesizeElementTypeOfArrayType(type);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20944,7 +21691,7 @@ var ts;
         }
         // @api
         function createRestTypeNode(type) {
-            var node = createBaseNode(180 /* RestType */);
+            var node = createBaseNode(181 /* RestType */);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -20968,7 +21715,7 @@ var ts;
         }
         // @api
         function createUnionTypeNode(types) {
-            return createUnionOrIntersectionTypeNode(181 /* UnionType */, types);
+            return createUnionOrIntersectionTypeNode(182 /* UnionType */, types);
         }
         // @api
         function updateUnionTypeNode(node, types) {
@@ -20976,7 +21723,7 @@ var ts;
         }
         // @api
         function createIntersectionTypeNode(types) {
-            return createUnionOrIntersectionTypeNode(182 /* IntersectionType */, types);
+            return createUnionOrIntersectionTypeNode(183 /* IntersectionType */, types);
         }
         // @api
         function updateIntersectionTypeNode(node, types) {
@@ -20984,7 +21731,7 @@ var ts;
         }
         // @api
         function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-            var node = createBaseNode(183 /* ConditionalType */);
+            var node = createBaseNode(184 /* ConditionalType */);
             node.checkType = parenthesizerRules().parenthesizeMemberOfConditionalType(checkType);
             node.extendsType = parenthesizerRules().parenthesizeMemberOfConditionalType(extendsType);
             node.trueType = trueType;
@@ -21003,7 +21750,7 @@ var ts;
         }
         // @api
         function createInferTypeNode(typeParameter) {
-            var node = createBaseNode(184 /* InferType */);
+            var node = createBaseNode(185 /* InferType */);
             node.typeParameter = typeParameter;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -21015,9 +21762,24 @@ var ts;
                 : node;
         }
         // @api
+        function createTemplateLiteralType(head, templateSpans) {
+            var node = createBaseNode(193 /* TemplateLiteralType */);
+            node.head = head;
+            node.templateSpans = createNodeArray(templateSpans);
+            node.transformFlags = 1 /* ContainsTypeScript */;
+            return node;
+        }
+        // @api
+        function updateTemplateLiteralType(node, head, templateSpans) {
+            return node.head !== head
+                || node.templateSpans !== templateSpans
+                ? update(createTemplateLiteralType(head, templateSpans), node)
+                : node;
+        }
+        // @api
         function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
             if (isTypeOf === void 0) { isTypeOf = false; }
-            var node = createBaseNode(192 /* ImportType */);
+            var node = createBaseNode(195 /* ImportType */);
             node.argument = argument;
             node.qualifier = qualifier;
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments);
@@ -21037,7 +21799,7 @@ var ts;
         }
         // @api
         function createParenthesizedType(type) {
-            var node = createBaseNode(185 /* ParenthesizedType */);
+            var node = createBaseNode(186 /* ParenthesizedType */);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -21050,13 +21812,13 @@ var ts;
         }
         // @api
         function createThisTypeNode() {
-            var node = createBaseNode(186 /* ThisType */);
+            var node = createBaseNode(187 /* ThisType */);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
         }
         // @api
         function createTypeOperatorNode(operator, type) {
-            var node = createBaseNode(187 /* TypeOperator */);
+            var node = createBaseNode(188 /* TypeOperator */);
             node.operator = operator;
             node.type = parenthesizerRules().parenthesizeMemberOfElementType(type);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21070,7 +21832,7 @@ var ts;
         }
         // @api
         function createIndexedAccessTypeNode(objectType, indexType) {
-            var node = createBaseNode(188 /* IndexedAccessType */);
+            var node = createBaseNode(189 /* IndexedAccessType */);
             node.objectType = parenthesizerRules().parenthesizeMemberOfElementType(objectType);
             node.indexType = indexType;
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21084,27 +21846,29 @@ var ts;
                 : node;
         }
         // @api
-        function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-            var node = createBaseNode(189 /* MappedType */);
+        function createMappedTypeNode(readonlyToken, typeParameter, nameType, questionToken, type) {
+            var node = createBaseNode(190 /* MappedType */);
             node.readonlyToken = readonlyToken;
             node.typeParameter = typeParameter;
+            node.nameType = nameType;
             node.questionToken = questionToken;
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
         }
         // @api
-        function updateMappedTypeNode(node, readonlyToken, typeParameter, questionToken, type) {
+        function updateMappedTypeNode(node, readonlyToken, typeParameter, nameType, questionToken, type) {
             return node.readonlyToken !== readonlyToken
                 || node.typeParameter !== typeParameter
+                || node.nameType !== nameType
                 || node.questionToken !== questionToken
                 || node.type !== type
-                ? update(createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), node)
+                ? update(createMappedTypeNode(readonlyToken, typeParameter, nameType, questionToken, type), node)
                 : node;
         }
         // @api
         function createLiteralTypeNode(literal) {
-            var node = createBaseNode(190 /* LiteralType */);
+            var node = createBaseNode(191 /* LiteralType */);
             node.literal = literal;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -21120,7 +21884,7 @@ var ts;
         //
         // @api
         function createObjectBindingPattern(elements) {
-            var node = createBaseNode(193 /* ObjectBindingPattern */);
+            var node = createBaseNode(196 /* ObjectBindingPattern */);
             node.elements = createNodeArray(elements);
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
@@ -21141,7 +21905,7 @@ var ts;
         }
         // @api
         function createArrayBindingPattern(elements) {
-            var node = createBaseNode(194 /* ArrayBindingPattern */);
+            var node = createBaseNode(197 /* ArrayBindingPattern */);
             node.elements = createNodeArray(elements);
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
@@ -21157,7 +21921,7 @@ var ts;
         }
         // @api
         function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-            var node = createBaseBindingLikeDeclaration(195 /* BindingElement */, 
+            var node = createBaseBindingLikeDeclaration(198 /* BindingElement */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name, initializer);
             node.propertyName = asName(propertyName);
@@ -21193,7 +21957,7 @@ var ts;
         }
         // @api
         function createArrayLiteralExpression(elements, multiLine) {
-            var node = createBaseExpression(196 /* ArrayLiteralExpression */);
+            var node = createBaseExpression(199 /* ArrayLiteralExpression */);
             node.elements = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(elements));
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.elements);
@@ -21207,7 +21971,7 @@ var ts;
         }
         // @api
         function createObjectLiteralExpression(properties, multiLine) {
-            var node = createBaseExpression(197 /* ObjectLiteralExpression */);
+            var node = createBaseExpression(200 /* ObjectLiteralExpression */);
             node.properties = createNodeArray(properties);
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.properties);
@@ -21221,7 +21985,7 @@ var ts;
         }
         // @api
         function createPropertyAccessExpression(expression, name) {
-            var node = createBaseExpression(198 /* PropertyAccessExpression */);
+            var node = createBaseExpression(201 /* PropertyAccessExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.name = asName(name);
             node.transformFlags =
@@ -21250,7 +22014,7 @@ var ts;
         }
         // @api
         function createPropertyAccessChain(expression, questionDotToken, name) {
-            var node = createBaseExpression(198 /* PropertyAccessExpression */);
+            var node = createBaseExpression(201 /* PropertyAccessExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
@@ -21277,7 +22041,7 @@ var ts;
         }
         // @api
         function createElementAccessExpression(expression, index) {
-            var node = createBaseExpression(199 /* ElementAccessExpression */);
+            var node = createBaseExpression(202 /* ElementAccessExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.argumentExpression = asExpression(index);
             node.transformFlags |=
@@ -21304,7 +22068,7 @@ var ts;
         }
         // @api
         function createElementAccessChain(expression, questionDotToken, index) {
-            var node = createBaseExpression(199 /* ElementAccessExpression */);
+            var node = createBaseExpression(202 /* ElementAccessExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
@@ -21329,7 +22093,7 @@ var ts;
         }
         // @api
         function createCallExpression(expression, typeArguments, argumentsArray) {
-            var node = createBaseExpression(200 /* CallExpression */);
+            var node = createBaseExpression(203 /* CallExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.typeArguments = asNodeArray(typeArguments);
             node.arguments = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(argumentsArray));
@@ -21361,7 +22125,7 @@ var ts;
         }
         // @api
         function createCallChain(expression, questionDotToken, typeArguments, argumentsArray) {
-            var node = createBaseExpression(200 /* CallExpression */);
+            var node = createBaseExpression(203 /* CallExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
@@ -21393,7 +22157,7 @@ var ts;
         }
         // @api
         function createNewExpression(expression, typeArguments, argumentsArray) {
-            var node = createBaseExpression(201 /* NewExpression */);
+            var node = createBaseExpression(204 /* NewExpression */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfNew(expression);
             node.typeArguments = asNodeArray(typeArguments);
             node.arguments = argumentsArray ? parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(argumentsArray) : undefined;
@@ -21417,7 +22181,7 @@ var ts;
         }
         // @api
         function createTaggedTemplateExpression(tag, typeArguments, template) {
-            var node = createBaseExpression(202 /* TaggedTemplateExpression */);
+            var node = createBaseExpression(205 /* TaggedTemplateExpression */);
             node.tag = parenthesizerRules().parenthesizeLeftSideOfAccess(tag);
             node.typeArguments = asNodeArray(typeArguments);
             node.template = template;
@@ -21444,7 +22208,7 @@ var ts;
         }
         // @api
         function createTypeAssertion(type, expression) {
-            var node = createBaseExpression(203 /* TypeAssertionExpression */);
+            var node = createBaseExpression(206 /* TypeAssertionExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.type = type;
             node.transformFlags |=
@@ -21462,7 +22226,7 @@ var ts;
         }
         // @api
         function createParenthesizedExpression(expression) {
-            var node = createBaseExpression(204 /* ParenthesizedExpression */);
+            var node = createBaseExpression(207 /* ParenthesizedExpression */);
             node.expression = expression;
             node.transformFlags = propagateChildFlags(node.expression);
             return node;
@@ -21475,7 +22239,7 @@ var ts;
         }
         // @api
         function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(205 /* FunctionExpression */, 
+            var node = createBaseFunctionLikeDeclaration(208 /* FunctionExpression */, 
             /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             node.transformFlags |= propagateChildFlags(node.asteriskToken);
@@ -21509,7 +22273,7 @@ var ts;
         }
         // @api
         function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-            var node = createBaseFunctionLikeDeclaration(206 /* ArrowFunction */, 
+            var node = createBaseFunctionLikeDeclaration(209 /* ArrowFunction */, 
             /*decorators*/ undefined, modifiers, 
             /*name*/ undefined, typeParameters, parameters, type, parenthesizerRules().parenthesizeConciseBodyOfArrowFunction(body));
             node.equalsGreaterThanToken = equalsGreaterThanToken !== null && equalsGreaterThanToken !== void 0 ? equalsGreaterThanToken : createToken(38 /* EqualsGreaterThanToken */);
@@ -21534,7 +22298,7 @@ var ts;
         }
         // @api
         function createDeleteExpression(expression) {
-            var node = createBaseExpression(207 /* DeleteExpression */);
+            var node = createBaseExpression(210 /* DeleteExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -21547,7 +22311,7 @@ var ts;
         }
         // @api
         function createTypeOfExpression(expression) {
-            var node = createBaseExpression(208 /* TypeOfExpression */);
+            var node = createBaseExpression(211 /* TypeOfExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -21560,7 +22324,7 @@ var ts;
         }
         // @api
         function createVoidExpression(expression) {
-            var node = createBaseExpression(209 /* VoidExpression */);
+            var node = createBaseExpression(212 /* VoidExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -21573,7 +22337,7 @@ var ts;
         }
         // @api
         function createAwaitExpression(expression) {
-            var node = createBaseExpression(210 /* AwaitExpression */);
+            var node = createBaseExpression(213 /* AwaitExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -21590,7 +22354,7 @@ var ts;
         }
         // @api
         function createPrefixUnaryExpression(operator, operand) {
-            var node = createBaseExpression(211 /* PrefixUnaryExpression */);
+            var node = createBaseExpression(214 /* PrefixUnaryExpression */);
             node.operator = operator;
             node.operand = parenthesizerRules().parenthesizeOperandOfPrefixUnary(operand);
             node.transformFlags |= propagateChildFlags(node.operand);
@@ -21604,7 +22368,7 @@ var ts;
         }
         // @api
         function createPostfixUnaryExpression(operand, operator) {
-            var node = createBaseExpression(212 /* PostfixUnaryExpression */);
+            var node = createBaseExpression(215 /* PostfixUnaryExpression */);
             node.operator = operator;
             node.operand = parenthesizerRules().parenthesizeOperandOfPostfixUnary(operand);
             node.transformFlags = propagateChildFlags(node.operand);
@@ -21618,7 +22382,7 @@ var ts;
         }
         // @api
         function createBinaryExpression(left, operator, right) {
-            var node = createBaseExpression(213 /* BinaryExpression */);
+            var node = createBaseExpression(216 /* BinaryExpression */);
             var operatorToken = asToken(operator);
             var operatorKind = operatorToken.kind;
             node.left = parenthesizerRules().parenthesizeLeftSideOfBinary(operatorKind, left);
@@ -21636,12 +22400,14 @@ var ts;
                     node.transformFlags |=
                         256 /* ContainsES2015 */ |
                             32 /* ContainsES2018 */ |
-                            1024 /* ContainsDestructuringAssignment */;
+                            1024 /* ContainsDestructuringAssignment */ |
+                            propagateAssignmentPatternFlags(node.left);
                 }
                 else if (ts.isArrayLiteralExpression(node.left)) {
                     node.transformFlags |=
                         256 /* ContainsES2015 */ |
-                            1024 /* ContainsDestructuringAssignment */;
+                            1024 /* ContainsDestructuringAssignment */ |
+                            propagateAssignmentPatternFlags(node.left);
                 }
             }
             else if (operatorKind === 42 /* AsteriskAsteriskToken */ || operatorKind === 66 /* AsteriskAsteriskEqualsToken */) {
@@ -21652,6 +22418,29 @@ var ts;
             }
             return node;
         }
+        function propagateAssignmentPatternFlags(node) {
+            if (node.transformFlags & 16384 /* ContainsObjectRestOrSpread */)
+                return 16384 /* ContainsObjectRestOrSpread */;
+            if (node.transformFlags & 32 /* ContainsES2018 */) {
+                // check for nested spread assignments, otherwise '{ x: { a, ...b } = foo } = c'
+                // will not be correctly interpreted by the ES2018 transformer
+                for (var _i = 0, _a = ts.getElementsOfBindingOrAssignmentPattern(node); _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    var target = ts.getTargetOfBindingOrAssignmentElement(element);
+                    if (target && ts.isAssignmentPattern(target)) {
+                        if (target.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+                            return 16384 /* ContainsObjectRestOrSpread */;
+                        }
+                        if (target.transformFlags & 32 /* ContainsES2018 */) {
+                            var flags_1 = propagateAssignmentPatternFlags(target);
+                            if (flags_1)
+                                return flags_1;
+                        }
+                    }
+                }
+            }
+            return 0 /* None */;
+        }
         // @api
         function updateBinaryExpression(node, left, operator, right) {
             return node.left !== left
@@ -21662,7 +22451,7 @@ var ts;
         }
         // @api
         function createConditionalExpression(condition, questionToken, whenTrue, colonToken, whenFalse) {
-            var node = createBaseExpression(214 /* ConditionalExpression */);
+            var node = createBaseExpression(217 /* ConditionalExpression */);
             node.condition = parenthesizerRules().parenthesizeConditionOfConditionalExpression(condition);
             node.questionToken = questionToken !== null && questionToken !== void 0 ? questionToken : createToken(57 /* QuestionToken */);
             node.whenTrue = parenthesizerRules().parenthesizeBranchOfConditionalExpression(whenTrue);
@@ -21688,7 +22477,7 @@ var ts;
         }
         // @api
         function createTemplateExpression(head, templateSpans) {
-            var node = createBaseExpression(215 /* TemplateExpression */);
+            var node = createBaseExpression(218 /* TemplateExpression */);
             node.head = head;
             node.templateSpans = createNodeArray(templateSpans);
             node.transformFlags |=
@@ -21758,7 +22547,7 @@ var ts;
         // @api
         function createYieldExpression(asteriskToken, expression) {
             ts.Debug.assert(!asteriskToken || !!expression, "A `YieldExpression` with an asteriskToken must have an expression.");
-            var node = createBaseExpression(216 /* YieldExpression */);
+            var node = createBaseExpression(219 /* YieldExpression */);
             node.expression = expression && parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.asteriskToken = asteriskToken;
             node.transformFlags |=
@@ -21778,7 +22567,7 @@ var ts;
         }
         // @api
         function createSpreadElement(expression) {
-            var node = createBaseExpression(217 /* SpreadElement */);
+            var node = createBaseExpression(220 /* SpreadElement */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -21794,7 +22583,7 @@ var ts;
         }
         // @api
         function createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseClassLikeDeclaration(218 /* ClassExpression */, decorators, modifiers, name, typeParameters, heritageClauses, members);
+            var node = createBaseClassLikeDeclaration(221 /* ClassExpression */, decorators, modifiers, name, typeParameters, heritageClauses, members);
             node.transformFlags |= 256 /* ContainsES2015 */;
             return node;
         }
@@ -21811,11 +22600,11 @@ var ts;
         }
         // @api
         function createOmittedExpression() {
-            return createBaseExpression(219 /* OmittedExpression */);
+            return createBaseExpression(222 /* OmittedExpression */);
         }
         // @api
         function createExpressionWithTypeArguments(expression, typeArguments) {
-            var node = createBaseNode(220 /* ExpressionWithTypeArguments */);
+            var node = createBaseNode(223 /* ExpressionWithTypeArguments */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments);
             node.transformFlags |=
@@ -21833,7 +22622,7 @@ var ts;
         }
         // @api
         function createAsExpression(expression, type) {
-            var node = createBaseExpression(221 /* AsExpression */);
+            var node = createBaseExpression(224 /* AsExpression */);
             node.expression = expression;
             node.type = type;
             node.transformFlags |=
@@ -21851,7 +22640,7 @@ var ts;
         }
         // @api
         function createNonNullExpression(expression) {
-            var node = createBaseExpression(222 /* NonNullExpression */);
+            var node = createBaseExpression(225 /* NonNullExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -21869,7 +22658,7 @@ var ts;
         }
         // @api
         function createNonNullChain(expression) {
-            var node = createBaseExpression(222 /* NonNullExpression */);
+            var node = createBaseExpression(225 /* NonNullExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
@@ -21886,7 +22675,7 @@ var ts;
         }
         // @api
         function createMetaProperty(keywordToken, name) {
-            var node = createBaseExpression(223 /* MetaProperty */);
+            var node = createBaseExpression(226 /* MetaProperty */);
             node.keywordToken = keywordToken;
             node.name = name;
             node.transformFlags |= propagateChildFlags(node.name);
@@ -21913,7 +22702,7 @@ var ts;
         //
         // @api
         function createTemplateSpan(expression, literal) {
-            var node = createBaseNode(225 /* TemplateSpan */);
+            var node = createBaseNode(228 /* TemplateSpan */);
             node.expression = expression;
             node.literal = literal;
             node.transformFlags |=
@@ -21931,7 +22720,7 @@ var ts;
         }
         // @api
         function createSemicolonClassElement() {
-            var node = createBaseNode(226 /* SemicolonClassElement */);
+            var node = createBaseNode(229 /* SemicolonClassElement */);
             node.transformFlags |= 256 /* ContainsES2015 */;
             return node;
         }
@@ -21940,7 +22729,7 @@ var ts;
         //
         // @api
         function createBlock(statements, multiLine) {
-            var node = createBaseNode(227 /* Block */);
+            var node = createBaseNode(230 /* Block */);
             node.statements = createNodeArray(statements);
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.statements);
@@ -21954,7 +22743,7 @@ var ts;
         }
         // @api
         function createVariableStatement(modifiers, declarationList) {
-            var node = createBaseDeclaration(229 /* VariableStatement */, /*decorators*/ undefined, modifiers);
+            var node = createBaseDeclaration(232 /* VariableStatement */, /*decorators*/ undefined, modifiers);
             node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
             node.transformFlags |=
                 propagateChildFlags(node.declarationList);
@@ -21972,11 +22761,11 @@ var ts;
         }
         // @api
         function createEmptyStatement() {
-            return createBaseNode(228 /* EmptyStatement */);
+            return createBaseNode(231 /* EmptyStatement */);
         }
         // @api
         function createExpressionStatement(expression) {
-            var node = createBaseNode(230 /* ExpressionStatement */);
+            var node = createBaseNode(233 /* ExpressionStatement */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfExpressionStatement(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -21989,7 +22778,7 @@ var ts;
         }
         // @api
         function createIfStatement(expression, thenStatement, elseStatement) {
-            var node = createBaseNode(231 /* IfStatement */);
+            var node = createBaseNode(234 /* IfStatement */);
             node.expression = expression;
             node.thenStatement = asEmbeddedStatement(thenStatement);
             node.elseStatement = asEmbeddedStatement(elseStatement);
@@ -22009,7 +22798,7 @@ var ts;
         }
         // @api
         function createDoStatement(statement, expression) {
-            var node = createBaseNode(232 /* DoStatement */);
+            var node = createBaseNode(235 /* DoStatement */);
             node.statement = asEmbeddedStatement(statement);
             node.expression = expression;
             node.transformFlags |=
@@ -22026,7 +22815,7 @@ var ts;
         }
         // @api
         function createWhileStatement(expression, statement) {
-            var node = createBaseNode(233 /* WhileStatement */);
+            var node = createBaseNode(236 /* WhileStatement */);
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -22043,7 +22832,7 @@ var ts;
         }
         // @api
         function createForStatement(initializer, condition, incrementor, statement) {
-            var node = createBaseNode(234 /* ForStatement */);
+            var node = createBaseNode(237 /* ForStatement */);
             node.initializer = initializer;
             node.condition = condition;
             node.incrementor = incrementor;
@@ -22066,7 +22855,7 @@ var ts;
         }
         // @api
         function createForInStatement(initializer, expression, statement) {
-            var node = createBaseNode(235 /* ForInStatement */);
+            var node = createBaseNode(238 /* ForInStatement */);
             node.initializer = initializer;
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
@@ -22086,7 +22875,7 @@ var ts;
         }
         // @api
         function createForOfStatement(awaitModifier, initializer, expression, statement) {
-            var node = createBaseNode(236 /* ForOfStatement */);
+            var node = createBaseNode(239 /* ForOfStatement */);
             node.awaitModifier = awaitModifier;
             node.initializer = initializer;
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
@@ -22112,7 +22901,7 @@ var ts;
         }
         // @api
         function createContinueStatement(label) {
-            var node = createBaseNode(237 /* ContinueStatement */);
+            var node = createBaseNode(240 /* ContinueStatement */);
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
@@ -22127,7 +22916,7 @@ var ts;
         }
         // @api
         function createBreakStatement(label) {
-            var node = createBaseNode(238 /* BreakStatement */);
+            var node = createBaseNode(241 /* BreakStatement */);
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
@@ -22142,7 +22931,7 @@ var ts;
         }
         // @api
         function createReturnStatement(expression) {
-            var node = createBaseNode(239 /* ReturnStatement */);
+            var node = createBaseNode(242 /* ReturnStatement */);
             node.expression = expression;
             // return in an ES2018 async generator must be awaited
             node.transformFlags |=
@@ -22159,7 +22948,7 @@ var ts;
         }
         // @api
         function createWithStatement(expression, statement) {
-            var node = createBaseNode(240 /* WithStatement */);
+            var node = createBaseNode(243 /* WithStatement */);
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -22176,7 +22965,7 @@ var ts;
         }
         // @api
         function createSwitchStatement(expression, caseBlock) {
-            var node = createBaseNode(241 /* SwitchStatement */);
+            var node = createBaseNode(244 /* SwitchStatement */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.caseBlock = caseBlock;
             node.transformFlags |=
@@ -22193,7 +22982,7 @@ var ts;
         }
         // @api
         function createLabeledStatement(label, statement) {
-            var node = createBaseNode(242 /* LabeledStatement */);
+            var node = createBaseNode(245 /* LabeledStatement */);
             node.label = asName(label);
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -22210,7 +22999,7 @@ var ts;
         }
         // @api
         function createThrowStatement(expression) {
-            var node = createBaseNode(243 /* ThrowStatement */);
+            var node = createBaseNode(246 /* ThrowStatement */);
             node.expression = expression;
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -22223,7 +23012,7 @@ var ts;
         }
         // @api
         function createTryStatement(tryBlock, catchClause, finallyBlock) {
-            var node = createBaseNode(244 /* TryStatement */);
+            var node = createBaseNode(247 /* TryStatement */);
             node.tryBlock = tryBlock;
             node.catchClause = catchClause;
             node.finallyBlock = finallyBlock;
@@ -22243,11 +23032,11 @@ var ts;
         }
         // @api
         function createDebuggerStatement() {
-            return createBaseNode(245 /* DebuggerStatement */);
+            return createBaseNode(248 /* DebuggerStatement */);
         }
         // @api
         function createVariableDeclaration(name, exclamationToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(246 /* VariableDeclaration */, 
+            var node = createBaseVariableLikeDeclaration(249 /* VariableDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
             node.exclamationToken = exclamationToken;
@@ -22269,7 +23058,7 @@ var ts;
         // @api
         function createVariableDeclarationList(declarations, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
-            var node = createBaseNode(247 /* VariableDeclarationList */);
+            var node = createBaseNode(250 /* VariableDeclarationList */);
             node.flags |= flags & 3 /* BlockScoped */;
             node.declarations = createNodeArray(declarations);
             node.transformFlags |=
@@ -22290,7 +23079,7 @@ var ts;
         }
         // @api
         function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(248 /* FunctionDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
+            var node = createBaseFunctionLikeDeclaration(251 /* FunctionDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             if (!node.body || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags = 1 /* ContainsTypeScript */;
@@ -22328,7 +23117,7 @@ var ts;
         }
         // @api
         function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseClassLikeDeclaration(249 /* ClassDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses, members);
+            var node = createBaseClassLikeDeclaration(252 /* ClassDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses, members);
             if (ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags = 1 /* ContainsTypeScript */;
             }
@@ -22353,7 +23142,7 @@ var ts;
         }
         // @api
         function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseInterfaceOrClassLikeDeclaration(250 /* InterfaceDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses);
+            var node = createBaseInterfaceOrClassLikeDeclaration(253 /* InterfaceDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses);
             node.members = createNodeArray(members);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22371,7 +23160,7 @@ var ts;
         }
         // @api
         function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-            var node = createBaseGenericNamedDeclaration(251 /* TypeAliasDeclaration */, decorators, modifiers, name, typeParameters);
+            var node = createBaseGenericNamedDeclaration(254 /* TypeAliasDeclaration */, decorators, modifiers, name, typeParameters);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22388,7 +23177,7 @@ var ts;
         }
         // @api
         function createEnumDeclaration(decorators, modifiers, name, members) {
-            var node = createBaseNamedDeclaration(252 /* EnumDeclaration */, decorators, modifiers, name);
+            var node = createBaseNamedDeclaration(255 /* EnumDeclaration */, decorators, modifiers, name);
             node.members = createNodeArray(members);
             node.transformFlags |=
                 propagateChildrenFlags(node.members) |
@@ -22408,7 +23197,7 @@ var ts;
         // @api
         function createModuleDeclaration(decorators, modifiers, name, body, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
-            var node = createBaseDeclaration(253 /* ModuleDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(256 /* ModuleDeclaration */, decorators, modifiers);
             node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 1024 /* GlobalAugmentation */);
             node.name = name;
             node.body = body;
@@ -22435,7 +23224,7 @@ var ts;
         }
         // @api
         function createModuleBlock(statements) {
-            var node = createBaseNode(254 /* ModuleBlock */);
+            var node = createBaseNode(257 /* ModuleBlock */);
             node.statements = createNodeArray(statements);
             node.transformFlags |= propagateChildrenFlags(node.statements);
             return node;
@@ -22448,7 +23237,7 @@ var ts;
         }
         // @api
         function createCaseBlock(clauses) {
-            var node = createBaseNode(255 /* CaseBlock */);
+            var node = createBaseNode(258 /* CaseBlock */);
             node.clauses = createNodeArray(clauses);
             node.transformFlags |= propagateChildrenFlags(node.clauses);
             return node;
@@ -22461,7 +23250,7 @@ var ts;
         }
         // @api
         function createNamespaceExportDeclaration(name) {
-            var node = createBaseNamedDeclaration(256 /* NamespaceExportDeclaration */, 
+            var node = createBaseNamedDeclaration(259 /* NamespaceExportDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -22475,7 +23264,7 @@ var ts;
         }
         // @api
         function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-            var node = createBaseNamedDeclaration(257 /* ImportEqualsDeclaration */, decorators, modifiers, name);
+            var node = createBaseNamedDeclaration(260 /* ImportEqualsDeclaration */, decorators, modifiers, name);
             node.moduleReference = moduleReference;
             node.transformFlags |= propagateChildFlags(node.moduleReference);
             if (!ts.isExternalModuleReference(node.moduleReference))
@@ -22494,7 +23283,7 @@ var ts;
         }
         // @api
         function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-            var node = createBaseDeclaration(258 /* ImportDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(261 /* ImportDeclaration */, decorators, modifiers);
             node.importClause = importClause;
             node.moduleSpecifier = moduleSpecifier;
             node.transformFlags |=
@@ -22514,7 +23303,7 @@ var ts;
         }
         // @api
         function createImportClause(isTypeOnly, name, namedBindings) {
-            var node = createBaseNode(259 /* ImportClause */);
+            var node = createBaseNode(262 /* ImportClause */);
             node.isTypeOnly = isTypeOnly;
             node.name = name;
             node.namedBindings = namedBindings;
@@ -22537,7 +23326,7 @@ var ts;
         }
         // @api
         function createNamespaceImport(name) {
-            var node = createBaseNode(260 /* NamespaceImport */);
+            var node = createBaseNode(263 /* NamespaceImport */);
             node.name = name;
             node.transformFlags |= propagateChildFlags(node.name);
             node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
@@ -22551,7 +23340,7 @@ var ts;
         }
         // @api
         function createNamespaceExport(name) {
-            var node = createBaseNode(266 /* NamespaceExport */);
+            var node = createBaseNode(269 /* NamespaceExport */);
             node.name = name;
             node.transformFlags |=
                 propagateChildFlags(node.name) |
@@ -22567,7 +23356,7 @@ var ts;
         }
         // @api
         function createNamedImports(elements) {
-            var node = createBaseNode(261 /* NamedImports */);
+            var node = createBaseNode(264 /* NamedImports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
             node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
@@ -22581,7 +23370,7 @@ var ts;
         }
         // @api
         function createImportSpecifier(propertyName, name) {
-            var node = createBaseNode(262 /* ImportSpecifier */);
+            var node = createBaseNode(265 /* ImportSpecifier */);
             node.propertyName = propertyName;
             node.name = name;
             node.transformFlags |=
@@ -22599,7 +23388,7 @@ var ts;
         }
         // @api
         function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-            var node = createBaseDeclaration(263 /* ExportAssignment */, decorators, modifiers);
+            var node = createBaseDeclaration(266 /* ExportAssignment */, decorators, modifiers);
             node.isExportEquals = isExportEquals;
             node.expression = isExportEquals
                 ? parenthesizerRules().parenthesizeRightSideOfBinary(62 /* EqualsToken */, /*leftSide*/ undefined, expression)
@@ -22618,7 +23407,7 @@ var ts;
         }
         // @api
         function createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier) {
-            var node = createBaseDeclaration(264 /* ExportDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(267 /* ExportDeclaration */, decorators, modifiers);
             node.isTypeOnly = isTypeOnly;
             node.exportClause = exportClause;
             node.moduleSpecifier = moduleSpecifier;
@@ -22640,7 +23429,7 @@ var ts;
         }
         // @api
         function createNamedExports(elements) {
-            var node = createBaseNode(265 /* NamedExports */);
+            var node = createBaseNode(268 /* NamedExports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
             node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
@@ -22654,7 +23443,7 @@ var ts;
         }
         // @api
         function createExportSpecifier(propertyName, name) {
-            var node = createBaseNode(267 /* ExportSpecifier */);
+            var node = createBaseNode(270 /* ExportSpecifier */);
             node.propertyName = asName(propertyName);
             node.name = asName(name);
             node.transformFlags |=
@@ -22672,7 +23461,7 @@ var ts;
         }
         // @api
         function createMissingDeclaration() {
-            var node = createBaseDeclaration(268 /* MissingDeclaration */, 
+            var node = createBaseDeclaration(271 /* MissingDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined);
             return node;
@@ -22682,7 +23471,7 @@ var ts;
         //
         // @api
         function createExternalModuleReference(expression) {
-            var node = createBaseNode(269 /* ExternalModuleReference */);
+            var node = createBaseNode(272 /* ExternalModuleReference */);
             node.expression = expression;
             node.transformFlags |= propagateChildFlags(node.expression);
             node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
@@ -22727,7 +23516,7 @@ var ts;
         }
         // @api
         function createJSDocFunctionType(parameters, type) {
-            var node = createBaseSignatureDeclaration(304 /* JSDocFunctionType */, 
+            var node = createBaseSignatureDeclaration(308 /* JSDocFunctionType */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, 
@@ -22744,7 +23533,7 @@ var ts;
         // @api
         function createJSDocTypeLiteral(propertyTags, isArrayType) {
             if (isArrayType === void 0) { isArrayType = false; }
-            var node = createBaseNode(308 /* JSDocTypeLiteral */);
+            var node = createBaseNode(312 /* JSDocTypeLiteral */);
             node.jsDocPropertyTags = asNodeArray(propertyTags);
             node.isArrayType = isArrayType;
             return node;
@@ -22758,7 +23547,7 @@ var ts;
         }
         // @api
         function createJSDocTypeExpression(type) {
-            var node = createBaseNode(298 /* JSDocTypeExpression */);
+            var node = createBaseNode(301 /* JSDocTypeExpression */);
             node.type = type;
             return node;
         }
@@ -22770,7 +23559,7 @@ var ts;
         }
         // @api
         function createJSDocSignature(typeParameters, parameters, type) {
-            var node = createBaseNode(309 /* JSDocSignature */);
+            var node = createBaseNode(313 /* JSDocSignature */);
             node.typeParameters = asNodeArray(typeParameters);
             node.parameters = createNodeArray(parameters);
             node.type = type;
@@ -22799,7 +23588,7 @@ var ts;
         }
         // @api
         function createJSDocTemplateTag(tagName, constraint, typeParameters, comment) {
-            var node = createBaseJSDocTag(326 /* JSDocTemplateTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("template"), comment);
+            var node = createBaseJSDocTag(330 /* JSDocTemplateTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("template"), comment);
             node.constraint = constraint;
             node.typeParameters = createNodeArray(typeParameters);
             return node;
@@ -22816,7 +23605,7 @@ var ts;
         }
         // @api
         function createJSDocTypedefTag(tagName, typeExpression, fullName, comment) {
-            var node = createBaseJSDocTag(327 /* JSDocTypedefTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("typedef"), comment);
+            var node = createBaseJSDocTag(331 /* JSDocTypedefTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("typedef"), comment);
             node.typeExpression = typeExpression;
             node.fullName = fullName;
             node.name = ts.getJSDocTypeAliasName(fullName);
@@ -22834,7 +23623,7 @@ var ts;
         }
         // @api
         function createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) {
-            var node = createBaseJSDocTag(322 /* JSDocParameterTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("param"), comment);
+            var node = createBaseJSDocTag(326 /* JSDocParameterTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("param"), comment);
             node.typeExpression = typeExpression;
             node.name = name;
             node.isNameFirst = !!isNameFirst;
@@ -22855,7 +23644,7 @@ var ts;
         }
         // @api
         function createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) {
-            var node = createBaseJSDocTag(328 /* JSDocPropertyTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("prop"), comment);
+            var node = createBaseJSDocTag(333 /* JSDocPropertyTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("prop"), comment);
             node.typeExpression = typeExpression;
             node.name = name;
             node.isNameFirst = !!isNameFirst;
@@ -22876,7 +23665,7 @@ var ts;
         }
         // @api
         function createJSDocCallbackTag(tagName, typeExpression, fullName, comment) {
-            var node = createBaseJSDocTag(320 /* JSDocCallbackTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("callback"), comment);
+            var node = createBaseJSDocTag(324 /* JSDocCallbackTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("callback"), comment);
             node.typeExpression = typeExpression;
             node.fullName = fullName;
             node.name = ts.getJSDocTypeAliasName(fullName);
@@ -22894,7 +23683,7 @@ var ts;
         }
         // @api
         function createJSDocAugmentsTag(tagName, className, comment) {
-            var node = createBaseJSDocTag(311 /* JSDocAugmentsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("augments"), comment);
+            var node = createBaseJSDocTag(315 /* JSDocAugmentsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("augments"), comment);
             node.class = className;
             return node;
         }
@@ -22909,11 +23698,37 @@ var ts;
         }
         // @api
         function createJSDocImplementsTag(tagName, className, comment) {
-            var node = createBaseJSDocTag(312 /* JSDocImplementsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("implements"), comment);
+            var node = createBaseJSDocTag(316 /* JSDocImplementsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("implements"), comment);
             node.class = className;
             return node;
         }
         // @api
+        function createJSDocSeeTag(tagName, name, comment) {
+            var node = createBaseJSDocTag(332 /* JSDocSeeTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("see"), comment);
+            node.name = name;
+            return node;
+        }
+        // @api
+        function updateJSDocSeeTag(node, tagName, name, comment) {
+            return node.tagName !== tagName
+                || node.name !== name
+                || node.comment !== comment
+                ? update(createJSDocSeeTag(tagName, name, comment), node)
+                : node;
+        }
+        // @api
+        function createJSDocNameReference(name) {
+            var node = createBaseNode(302 /* JSDocNameReference */);
+            node.name = name;
+            return node;
+        }
+        // @api
+        function updateJSDocNameReference(node, name) {
+            return node.name !== name
+                ? update(createJSDocNameReference(name), node)
+                : node;
+        }
+        // @api
         function updateJSDocImplementsTag(node, tagName, className, comment) {
             if (tagName === void 0) { tagName = getDefaultTagName(node); }
             return node.tagName !== tagName
@@ -22974,7 +23789,7 @@ var ts;
         }
         // @api
         function createJSDocUnknownTag(tagName, comment) {
-            var node = createBaseJSDocTag(310 /* JSDocTag */, tagName, comment);
+            var node = createBaseJSDocTag(314 /* JSDocTag */, tagName, comment);
             return node;
         }
         // @api
@@ -22986,7 +23801,7 @@ var ts;
         }
         // @api
         function createJSDocComment(comment, tags) {
-            var node = createBaseNode(307 /* JSDocComment */);
+            var node = createBaseNode(311 /* JSDocComment */);
             node.comment = comment;
             node.tags = asNodeArray(tags);
             return node;
@@ -23003,7 +23818,7 @@ var ts;
         //
         // @api
         function createJsxElement(openingElement, children, closingElement) {
-            var node = createBaseNode(270 /* JsxElement */);
+            var node = createBaseNode(273 /* JsxElement */);
             node.openingElement = openingElement;
             node.children = createNodeArray(children);
             node.closingElement = closingElement;
@@ -23024,7 +23839,7 @@ var ts;
         }
         // @api
         function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-            var node = createBaseNode(271 /* JsxSelfClosingElement */);
+            var node = createBaseNode(274 /* JsxSelfClosingElement */);
             node.tagName = tagName;
             node.typeArguments = asNodeArray(typeArguments);
             node.attributes = attributes;
@@ -23048,7 +23863,7 @@ var ts;
         }
         // @api
         function createJsxOpeningElement(tagName, typeArguments, attributes) {
-            var node = createBaseNode(272 /* JsxOpeningElement */);
+            var node = createBaseNode(275 /* JsxOpeningElement */);
             node.tagName = tagName;
             node.typeArguments = asNodeArray(typeArguments);
             node.attributes = attributes;
@@ -23072,7 +23887,7 @@ var ts;
         }
         // @api
         function createJsxClosingElement(tagName) {
-            var node = createBaseNode(273 /* JsxClosingElement */);
+            var node = createBaseNode(276 /* JsxClosingElement */);
             node.tagName = tagName;
             node.transformFlags |=
                 propagateChildFlags(node.tagName) |
@@ -23087,7 +23902,7 @@ var ts;
         }
         // @api
         function createJsxFragment(openingFragment, children, closingFragment) {
-            var node = createBaseNode(274 /* JsxFragment */);
+            var node = createBaseNode(277 /* JsxFragment */);
             node.openingFragment = openingFragment;
             node.children = createNodeArray(children);
             node.closingFragment = closingFragment;
@@ -23123,19 +23938,19 @@ var ts;
         }
         // @api
         function createJsxOpeningFragment() {
-            var node = createBaseNode(275 /* JsxOpeningFragment */);
+            var node = createBaseNode(278 /* JsxOpeningFragment */);
             node.transformFlags |= 2 /* ContainsJsx */;
             return node;
         }
         // @api
         function createJsxJsxClosingFragment() {
-            var node = createBaseNode(276 /* JsxClosingFragment */);
+            var node = createBaseNode(279 /* JsxClosingFragment */);
             node.transformFlags |= 2 /* ContainsJsx */;
             return node;
         }
         // @api
         function createJsxAttribute(name, initializer) {
-            var node = createBaseNode(277 /* JsxAttribute */);
+            var node = createBaseNode(280 /* JsxAttribute */);
             node.name = name;
             node.initializer = initializer;
             node.transformFlags |=
@@ -23153,7 +23968,7 @@ var ts;
         }
         // @api
         function createJsxAttributes(properties) {
-            var node = createBaseNode(278 /* JsxAttributes */);
+            var node = createBaseNode(281 /* JsxAttributes */);
             node.properties = createNodeArray(properties);
             node.transformFlags |=
                 propagateChildrenFlags(node.properties) |
@@ -23168,7 +23983,7 @@ var ts;
         }
         // @api
         function createJsxSpreadAttribute(expression) {
-            var node = createBaseNode(279 /* JsxSpreadAttribute */);
+            var node = createBaseNode(282 /* JsxSpreadAttribute */);
             node.expression = expression;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -23183,7 +23998,7 @@ var ts;
         }
         // @api
         function createJsxExpression(dotDotDotToken, expression) {
-            var node = createBaseNode(280 /* JsxExpression */);
+            var node = createBaseNode(283 /* JsxExpression */);
             node.dotDotDotToken = dotDotDotToken;
             node.expression = expression;
             node.transformFlags |=
@@ -23203,7 +24018,7 @@ var ts;
         //
         // @api
         function createCaseClause(expression, statements) {
-            var node = createBaseNode(281 /* CaseClause */);
+            var node = createBaseNode(284 /* CaseClause */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.statements = createNodeArray(statements);
             node.transformFlags |=
@@ -23220,7 +24035,7 @@ var ts;
         }
         // @api
         function createDefaultClause(statements) {
-            var node = createBaseNode(282 /* DefaultClause */);
+            var node = createBaseNode(285 /* DefaultClause */);
             node.statements = createNodeArray(statements);
             node.transformFlags = propagateChildrenFlags(node.statements);
             return node;
@@ -23233,7 +24048,7 @@ var ts;
         }
         // @api
         function createHeritageClause(token, types) {
-            var node = createBaseNode(283 /* HeritageClause */);
+            var node = createBaseNode(286 /* HeritageClause */);
             node.token = token;
             node.types = createNodeArray(types);
             node.transformFlags |= propagateChildrenFlags(node.types);
@@ -23257,7 +24072,7 @@ var ts;
         }
         // @api
         function createCatchClause(variableDeclaration, block) {
-            var node = createBaseNode(284 /* CatchClause */);
+            var node = createBaseNode(287 /* CatchClause */);
             variableDeclaration = !ts.isString(variableDeclaration) ? variableDeclaration : createVariableDeclaration(variableDeclaration, 
             /*exclamationToken*/ undefined, 
             /*type*/ undefined, 
@@ -23283,7 +24098,7 @@ var ts;
         //
         // @api
         function createPropertyAssignment(name, initializer) {
-            var node = createBaseNamedDeclaration(285 /* PropertyAssignment */, 
+            var node = createBaseNamedDeclaration(288 /* PropertyAssignment */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.initializer = parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer);
@@ -23313,7 +24128,7 @@ var ts;
         }
         // @api
         function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-            var node = createBaseNamedDeclaration(286 /* ShorthandPropertyAssignment */, 
+            var node = createBaseNamedDeclaration(289 /* ShorthandPropertyAssignment */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.objectAssignmentInitializer = objectAssignmentInitializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(objectAssignmentInitializer);
@@ -23345,7 +24160,7 @@ var ts;
         }
         // @api
         function createSpreadAssignment(expression) {
-            var node = createBaseNode(287 /* SpreadAssignment */);
+            var node = createBaseNode(290 /* SpreadAssignment */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -23364,7 +24179,7 @@ var ts;
         //
         // @api
         function createEnumMember(name, initializer) {
-            var node = createBaseNode(288 /* EnumMember */);
+            var node = createBaseNode(291 /* EnumMember */);
             node.name = asName(name);
             node.initializer = initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer);
             node.transformFlags |=
@@ -23385,7 +24200,7 @@ var ts;
         //
         // @api
         function createSourceFile(statements, endOfFileToken, flags) {
-            var node = baseFactory.createBaseSourceFileNode(294 /* SourceFile */);
+            var node = baseFactory.createBaseSourceFileNode(297 /* SourceFile */);
             node.statements = createNodeArray(statements);
             node.endOfFileToken = endOfFileToken;
             node.flags |= flags;
@@ -23402,7 +24217,7 @@ var ts;
             return node;
         }
         function cloneSourceFileWithChanges(source, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) {
-            var node = baseFactory.createBaseSourceFileNode(294 /* SourceFile */);
+            var node = baseFactory.createBaseSourceFileNode(297 /* SourceFile */);
             for (var p in source) {
                 if (p === "emitNode" || ts.hasProperty(node, p) || !ts.hasProperty(source, p))
                     continue;
@@ -23440,7 +24255,7 @@ var ts;
         // @api
         function createBundle(sourceFiles, prepends) {
             if (prepends === void 0) { prepends = ts.emptyArray; }
-            var node = createBaseNode(295 /* Bundle */);
+            var node = createBaseNode(298 /* Bundle */);
             node.prepends = prepends;
             node.sourceFiles = sourceFiles;
             return node;
@@ -23455,7 +24270,7 @@ var ts;
         }
         // @api
         function createUnparsedSource(prologues, syntheticReferences, texts) {
-            var node = createBaseNode(296 /* UnparsedSource */);
+            var node = createBaseNode(299 /* UnparsedSource */);
             node.prologues = prologues;
             node.syntheticReferences = syntheticReferences;
             node.texts = texts;
@@ -23473,28 +24288,28 @@ var ts;
         }
         // @api
         function createUnparsedPrologue(data) {
-            return createBaseUnparsedNode(289 /* UnparsedPrologue */, data);
+            return createBaseUnparsedNode(292 /* UnparsedPrologue */, data);
         }
         // @api
         function createUnparsedPrepend(data, texts) {
-            var node = createBaseUnparsedNode(290 /* UnparsedPrepend */, data);
+            var node = createBaseUnparsedNode(293 /* UnparsedPrepend */, data);
             node.texts = texts;
             return node;
         }
         // @api
         function createUnparsedTextLike(data, internal) {
-            return createBaseUnparsedNode(internal ? 292 /* UnparsedInternalText */ : 291 /* UnparsedText */, data);
+            return createBaseUnparsedNode(internal ? 295 /* UnparsedInternalText */ : 294 /* UnparsedText */, data);
         }
         // @api
         function createUnparsedSyntheticReference(section) {
-            var node = createBaseNode(293 /* UnparsedSyntheticReference */);
+            var node = createBaseNode(296 /* UnparsedSyntheticReference */);
             node.data = section.data;
             node.section = section;
             return node;
         }
         // @api
         function createInputFiles() {
-            var node = createBaseNode(297 /* InputFiles */);
+            var node = createBaseNode(300 /* InputFiles */);
             node.javascriptText = "";
             node.declarationText = "";
             return node;
@@ -23505,7 +24320,7 @@ var ts;
         // @api
         function createSyntheticExpression(type, isSpread, tupleNameSource) {
             if (isSpread === void 0) { isSpread = false; }
-            var node = createBaseNode(224 /* SyntheticExpression */);
+            var node = createBaseNode(227 /* SyntheticExpression */);
             node.type = type;
             node.isSpread = isSpread;
             node.tupleNameSource = tupleNameSource;
@@ -23513,7 +24328,7 @@ var ts;
         }
         // @api
         function createSyntaxList(children) {
-            var node = createBaseNode(329 /* SyntaxList */);
+            var node = createBaseNode(334 /* SyntaxList */);
             node._children = children;
             return node;
         }
@@ -23528,7 +24343,7 @@ var ts;
          */
         // @api
         function createNotEmittedStatement(original) {
-            var node = createBaseNode(330 /* NotEmittedStatement */);
+            var node = createBaseNode(335 /* NotEmittedStatement */);
             node.original = original;
             ts.setTextRange(node, original);
             return node;
@@ -23542,7 +24357,7 @@ var ts;
          */
         // @api
         function createPartiallyEmittedExpression(expression, original) {
-            var node = createBaseNode(331 /* PartiallyEmittedExpression */);
+            var node = createBaseNode(336 /* PartiallyEmittedExpression */);
             node.expression = expression;
             node.original = original;
             node.transformFlags |=
@@ -23570,7 +24385,7 @@ var ts;
         }
         // @api
         function createCommaListExpression(elements) {
-            var node = createBaseNode(332 /* CommaListExpression */);
+            var node = createBaseNode(337 /* CommaListExpression */);
             node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
             node.transformFlags |= propagateChildrenFlags(node.elements);
             return node;
@@ -23587,7 +24402,7 @@ var ts;
          */
         // @api
         function createEndOfDeclarationMarker(original) {
-            var node = createBaseNode(334 /* EndOfDeclarationMarker */);
+            var node = createBaseNode(339 /* EndOfDeclarationMarker */);
             node.emitNode = {};
             node.original = original;
             return node;
@@ -23598,14 +24413,14 @@ var ts;
          */
         // @api
         function createMergeDeclarationMarker(original) {
-            var node = createBaseNode(333 /* MergeDeclarationMarker */);
+            var node = createBaseNode(338 /* MergeDeclarationMarker */);
             node.emitNode = {};
             node.original = original;
             return node;
         }
         // @api
         function createSyntheticReferenceExpression(expression, thisArg) {
-            var node = createBaseNode(335 /* SyntheticReferenceExpression */);
+            var node = createBaseNode(340 /* SyntheticReferenceExpression */);
             node.expression = expression;
             node.thisArg = thisArg;
             node.transformFlags |=
@@ -23627,7 +24442,7 @@ var ts;
             if (node === undefined) {
                 return node;
             }
-            var clone = ts.isSourceFile(node) ? baseFactory.createBaseSourceFileNode(294 /* SourceFile */) :
+            var clone = ts.isSourceFile(node) ? baseFactory.createBaseSourceFileNode(297 /* SourceFile */) :
                 ts.isIdentifier(node) ? baseFactory.createBaseIdentifierNode(78 /* Identifier */) :
                     ts.isPrivateIdentifier(node) ? baseFactory.createBasePrivateIdentifierNode(79 /* PrivateIdentifier */) :
                         !ts.isNodeKind(node.kind) ? baseFactory.createBaseTokenNode(node.kind) :
@@ -23734,11 +24549,11 @@ var ts;
         }
         function updateOuterExpression(outerExpression, expression) {
             switch (outerExpression.kind) {
-                case 204 /* ParenthesizedExpression */: return updateParenthesizedExpression(outerExpression, expression);
-                case 203 /* TypeAssertionExpression */: return updateTypeAssertion(outerExpression, outerExpression.type, expression);
-                case 221 /* AsExpression */: return updateAsExpression(outerExpression, expression, outerExpression.type);
-                case 222 /* NonNullExpression */: return updateNonNullExpression(outerExpression, expression);
-                case 331 /* PartiallyEmittedExpression */: return updatePartiallyEmittedExpression(outerExpression, expression);
+                case 207 /* ParenthesizedExpression */: return updateParenthesizedExpression(outerExpression, expression);
+                case 206 /* TypeAssertionExpression */: return updateTypeAssertion(outerExpression, outerExpression.type, expression);
+                case 224 /* AsExpression */: return updateAsExpression(outerExpression, expression, outerExpression.type);
+                case 225 /* NonNullExpression */: return updateNonNullExpression(outerExpression, expression);
+                case 336 /* PartiallyEmittedExpression */: return updatePartiallyEmittedExpression(outerExpression, expression);
             }
         }
         /**
@@ -23792,13 +24607,13 @@ var ts;
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
                     return false;
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     var elements = target.elements;
                     if (elements.length === 0) {
                         return false;
                     }
                     return true;
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return target.properties.length > 0;
                 default:
                     return true;
@@ -24201,23 +25016,23 @@ var ts;
     }
     function getDefaultTagNameForKind(kind) {
         switch (kind) {
-            case 325 /* JSDocTypeTag */: return "type";
-            case 323 /* JSDocReturnTag */: return "returns";
-            case 324 /* JSDocThisTag */: return "this";
-            case 321 /* JSDocEnumTag */: return "enum";
-            case 313 /* JSDocAuthorTag */: return "author";
-            case 315 /* JSDocClassTag */: return "class";
-            case 316 /* JSDocPublicTag */: return "public";
-            case 317 /* JSDocPrivateTag */: return "private";
-            case 318 /* JSDocProtectedTag */: return "protected";
-            case 319 /* JSDocReadonlyTag */: return "readonly";
-            case 326 /* JSDocTemplateTag */: return "template";
-            case 327 /* JSDocTypedefTag */: return "typedef";
-            case 322 /* JSDocParameterTag */: return "param";
-            case 328 /* JSDocPropertyTag */: return "prop";
-            case 320 /* JSDocCallbackTag */: return "callback";
-            case 311 /* JSDocAugmentsTag */: return "augments";
-            case 312 /* JSDocImplementsTag */: return "implements";
+            case 329 /* JSDocTypeTag */: return "type";
+            case 327 /* JSDocReturnTag */: return "returns";
+            case 328 /* JSDocThisTag */: return "this";
+            case 325 /* JSDocEnumTag */: return "enum";
+            case 317 /* JSDocAuthorTag */: return "author";
+            case 319 /* JSDocClassTag */: return "class";
+            case 320 /* JSDocPublicTag */: return "public";
+            case 321 /* JSDocPrivateTag */: return "private";
+            case 322 /* JSDocProtectedTag */: return "protected";
+            case 323 /* JSDocReadonlyTag */: return "readonly";
+            case 330 /* JSDocTemplateTag */: return "template";
+            case 331 /* JSDocTypedefTag */: return "typedef";
+            case 326 /* JSDocParameterTag */: return "param";
+            case 333 /* JSDocPropertyTag */: return "prop";
+            case 324 /* JSDocCallbackTag */: return "callback";
+            case 315 /* JSDocAugmentsTag */: return "augments";
+            case 316 /* JSDocImplementsTag */: return "implements";
             default:
                 return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind));
         }
@@ -24297,69 +25112,69 @@ var ts;
      */
     /* @internal */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 171 /* FirstTypeNode */ && kind <= 192 /* LastTypeNode */) {
+        if (kind >= 172 /* FirstTypeNode */ && kind <= 195 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 200 /* CallExpression */:
-            case 201 /* NewExpression */:
-            case 196 /* ArrayLiteralExpression */:
+            case 203 /* CallExpression */:
+            case 204 /* NewExpression */:
+            case 199 /* ArrayLiteralExpression */:
                 return 536879104 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return 546379776 /* ModuleExcludes */;
-            case 159 /* Parameter */:
+            case 160 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 206 /* ArrowFunction */:
+            case 209 /* ArrowFunction */:
                 return 547309568 /* ArrowFunctionExcludes */;
-            case 205 /* FunctionExpression */:
-            case 248 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 251 /* FunctionDeclaration */:
                 return 547313664 /* FunctionExcludes */;
-            case 247 /* VariableDeclarationList */:
+            case 250 /* VariableDeclarationList */:
                 return 537018368 /* VariableDeclarationListExcludes */;
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* ClassExpression */:
                 return 536905728 /* ClassExcludes */;
-            case 165 /* Constructor */:
+            case 166 /* Constructor */:
                 return 547311616 /* ConstructorExcludes */;
-            case 162 /* PropertyDeclaration */:
+            case 163 /* PropertyDeclaration */:
                 return 536875008 /* PropertyExcludes */;
-            case 164 /* MethodDeclaration */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
+            case 165 /* MethodDeclaration */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
                 return 538923008 /* MethodOrAccessorExcludes */;
             case 128 /* AnyKeyword */:
-            case 143 /* NumberKeyword */:
-            case 154 /* BigIntKeyword */:
-            case 140 /* NeverKeyword */:
-            case 146 /* StringKeyword */:
-            case 144 /* ObjectKeyword */:
+            case 144 /* NumberKeyword */:
+            case 155 /* BigIntKeyword */:
+            case 141 /* NeverKeyword */:
+            case 147 /* StringKeyword */:
+            case 145 /* ObjectKeyword */:
             case 131 /* BooleanKeyword */:
-            case 147 /* SymbolKeyword */:
+            case 148 /* SymbolKeyword */:
             case 113 /* VoidKeyword */:
-            case 158 /* TypeParameter */:
-            case 161 /* PropertySignature */:
-            case 163 /* MethodSignature */:
-            case 168 /* CallSignature */:
-            case 169 /* ConstructSignature */:
-            case 170 /* IndexSignature */:
-            case 250 /* InterfaceDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
+            case 159 /* TypeParameter */:
+            case 162 /* PropertySignature */:
+            case 164 /* MethodSignature */:
+            case 169 /* CallSignature */:
+            case 170 /* ConstructSignature */:
+            case 171 /* IndexSignature */:
+            case 253 /* InterfaceDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 197 /* ObjectLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
                 return 536922112 /* ObjectLiteralExcludes */;
-            case 284 /* CatchClause */:
+            case 287 /* CatchClause */:
                 return 536887296 /* CatchClauseExcludes */;
-            case 193 /* ObjectBindingPattern */:
-            case 194 /* ArrayBindingPattern */:
+            case 196 /* ObjectBindingPattern */:
+            case 197 /* ArrayBindingPattern */:
                 return 536879104 /* BindingPatternExcludes */;
-            case 203 /* TypeAssertionExpression */:
-            case 221 /* AsExpression */:
-            case 331 /* PartiallyEmittedExpression */:
-            case 204 /* ParenthesizedExpression */:
+            case 206 /* TypeAssertionExpression */:
+            case 224 /* AsExpression */:
+            case 336 /* PartiallyEmittedExpression */:
+            case 207 /* ParenthesizedExpression */:
             case 105 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 198 /* PropertyAccessExpression */:
-            case 199 /* ElementAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -24658,7 +25473,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 === 294 /* SourceFile */) {
+                if (node.kind === 297 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = (_a = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)))) !== null && _a !== void 0 ? _a : ts.Debug.fail("Could not determine parsed source file.");
@@ -25515,11 +26330,11 @@ var ts;
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 156 /* QualifiedName */;
+        return node.kind === 157 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 157 /* ComputedPropertyName */;
+        return node.kind === 158 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     function isPrivateIdentifier(node) {
@@ -25554,572 +26369,580 @@ var ts;
     ts.isExclamationToken = isExclamationToken;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 158 /* TypeParameter */;
+        return node.kind === 159 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     // TODO(rbuckton): Rename to 'isParameterDeclaration'
     function isParameter(node) {
-        return node.kind === 159 /* Parameter */;
+        return node.kind === 160 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 160 /* Decorator */;
+        return node.kind === 161 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 161 /* PropertySignature */;
+        return node.kind === 162 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 162 /* PropertyDeclaration */;
+        return node.kind === 163 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 163 /* MethodSignature */;
+        return node.kind === 164 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 164 /* MethodDeclaration */;
+        return node.kind === 165 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 165 /* Constructor */;
+        return node.kind === 166 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 166 /* GetAccessor */;
+        return node.kind === 167 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 167 /* SetAccessor */;
+        return node.kind === 168 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 168 /* CallSignature */;
+        return node.kind === 169 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 169 /* ConstructSignature */;
+        return node.kind === 170 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 170 /* IndexSignature */;
+        return node.kind === 171 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 171 /* TypePredicate */;
+        return node.kind === 172 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 172 /* TypeReference */;
+        return node.kind === 173 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 173 /* FunctionType */;
+        return node.kind === 174 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 174 /* ConstructorType */;
+        return node.kind === 175 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 175 /* TypeQuery */;
+        return node.kind === 176 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 176 /* TypeLiteral */;
+        return node.kind === 177 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 177 /* ArrayType */;
+        return node.kind === 178 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 178 /* TupleType */;
+        return node.kind === 179 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isNamedTupleMember(node) {
-        return node.kind === 191 /* NamedTupleMember */;
+        return node.kind === 192 /* NamedTupleMember */;
     }
     ts.isNamedTupleMember = isNamedTupleMember;
     function isOptionalTypeNode(node) {
-        return node.kind === 179 /* OptionalType */;
+        return node.kind === 180 /* OptionalType */;
     }
     ts.isOptionalTypeNode = isOptionalTypeNode;
     function isRestTypeNode(node) {
-        return node.kind === 180 /* RestType */;
+        return node.kind === 181 /* RestType */;
     }
     ts.isRestTypeNode = isRestTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 181 /* UnionType */;
+        return node.kind === 182 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 182 /* IntersectionType */;
+        return node.kind === 183 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 183 /* ConditionalType */;
+        return node.kind === 184 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 184 /* InferType */;
+        return node.kind === 185 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 185 /* ParenthesizedType */;
+        return node.kind === 186 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 186 /* ThisType */;
+        return node.kind === 187 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 187 /* TypeOperator */;
+        return node.kind === 188 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 188 /* IndexedAccessType */;
+        return node.kind === 189 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 189 /* MappedType */;
+        return node.kind === 190 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 190 /* LiteralType */;
+        return node.kind === 191 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 192 /* ImportType */;
+        return node.kind === 195 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
+    function isTemplateLiteralTypeSpan(node) {
+        return node.kind === 194 /* TemplateLiteralTypeSpan */;
+    }
+    ts.isTemplateLiteralTypeSpan = isTemplateLiteralTypeSpan;
+    function isTemplateLiteralTypeNode(node) {
+        return node.kind === 193 /* TemplateLiteralType */;
+    }
+    ts.isTemplateLiteralTypeNode = isTemplateLiteralTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 193 /* ObjectBindingPattern */;
+        return node.kind === 196 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 194 /* ArrayBindingPattern */;
+        return node.kind === 197 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 195 /* BindingElement */;
+        return node.kind === 198 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 196 /* ArrayLiteralExpression */;
+        return node.kind === 199 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 197 /* ObjectLiteralExpression */;
+        return node.kind === 200 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 198 /* PropertyAccessExpression */;
+        return node.kind === 201 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 199 /* ElementAccessExpression */;
+        return node.kind === 202 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 200 /* CallExpression */;
+        return node.kind === 203 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 201 /* NewExpression */;
+        return node.kind === 204 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 202 /* TaggedTemplateExpression */;
+        return node.kind === 205 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertionExpression(node) {
-        return node.kind === 203 /* TypeAssertionExpression */;
+        return node.kind === 206 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertionExpression = isTypeAssertionExpression;
     function isParenthesizedExpression(node) {
-        return node.kind === 204 /* ParenthesizedExpression */;
+        return node.kind === 207 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function isFunctionExpression(node) {
-        return node.kind === 205 /* FunctionExpression */;
+        return node.kind === 208 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 206 /* ArrowFunction */;
+        return node.kind === 209 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 207 /* DeleteExpression */;
+        return node.kind === 210 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 208 /* TypeOfExpression */;
+        return node.kind === 211 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 209 /* VoidExpression */;
+        return node.kind === 212 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 210 /* AwaitExpression */;
+        return node.kind === 213 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 211 /* PrefixUnaryExpression */;
+        return node.kind === 214 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 212 /* PostfixUnaryExpression */;
+        return node.kind === 215 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 213 /* BinaryExpression */;
+        return node.kind === 216 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 214 /* ConditionalExpression */;
+        return node.kind === 217 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 215 /* TemplateExpression */;
+        return node.kind === 218 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 216 /* YieldExpression */;
+        return node.kind === 219 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 217 /* SpreadElement */;
+        return node.kind === 220 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 218 /* ClassExpression */;
+        return node.kind === 221 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 219 /* OmittedExpression */;
+        return node.kind === 222 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 220 /* ExpressionWithTypeArguments */;
+        return node.kind === 223 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 221 /* AsExpression */;
+        return node.kind === 224 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 222 /* NonNullExpression */;
+        return node.kind === 225 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 223 /* MetaProperty */;
+        return node.kind === 226 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     function isSyntheticExpression(node) {
-        return node.kind === 224 /* SyntheticExpression */;
+        return node.kind === 227 /* SyntheticExpression */;
     }
     ts.isSyntheticExpression = isSyntheticExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 331 /* PartiallyEmittedExpression */;
+        return node.kind === 336 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isCommaListExpression(node) {
-        return node.kind === 332 /* CommaListExpression */;
+        return node.kind === 337 /* CommaListExpression */;
     }
     ts.isCommaListExpression = isCommaListExpression;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 225 /* TemplateSpan */;
+        return node.kind === 228 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 226 /* SemicolonClassElement */;
+        return node.kind === 229 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Elements
     function isBlock(node) {
-        return node.kind === 227 /* Block */;
+        return node.kind === 230 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 229 /* VariableStatement */;
+        return node.kind === 232 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 228 /* EmptyStatement */;
+        return node.kind === 231 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 230 /* ExpressionStatement */;
+        return node.kind === 233 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 231 /* IfStatement */;
+        return node.kind === 234 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 232 /* DoStatement */;
+        return node.kind === 235 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 233 /* WhileStatement */;
+        return node.kind === 236 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 234 /* ForStatement */;
+        return node.kind === 237 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 235 /* ForInStatement */;
+        return node.kind === 238 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 236 /* ForOfStatement */;
+        return node.kind === 239 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 237 /* ContinueStatement */;
+        return node.kind === 240 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 238 /* BreakStatement */;
+        return node.kind === 241 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isReturnStatement(node) {
-        return node.kind === 239 /* ReturnStatement */;
+        return node.kind === 242 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 240 /* WithStatement */;
+        return node.kind === 243 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 241 /* SwitchStatement */;
+        return node.kind === 244 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 242 /* LabeledStatement */;
+        return node.kind === 245 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 243 /* ThrowStatement */;
+        return node.kind === 246 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 244 /* TryStatement */;
+        return node.kind === 247 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 245 /* DebuggerStatement */;
+        return node.kind === 248 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 246 /* VariableDeclaration */;
+        return node.kind === 249 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 247 /* VariableDeclarationList */;
+        return node.kind === 250 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 248 /* FunctionDeclaration */;
+        return node.kind === 251 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 249 /* ClassDeclaration */;
+        return node.kind === 252 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 250 /* InterfaceDeclaration */;
+        return node.kind === 253 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 251 /* TypeAliasDeclaration */;
+        return node.kind === 254 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 252 /* EnumDeclaration */;
+        return node.kind === 255 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 253 /* ModuleDeclaration */;
+        return node.kind === 256 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 254 /* ModuleBlock */;
+        return node.kind === 257 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 255 /* CaseBlock */;
+        return node.kind === 258 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 256 /* NamespaceExportDeclaration */;
+        return node.kind === 259 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 257 /* ImportEqualsDeclaration */;
+        return node.kind === 260 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 258 /* ImportDeclaration */;
+        return node.kind === 261 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 259 /* ImportClause */;
+        return node.kind === 262 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 260 /* NamespaceImport */;
+        return node.kind === 263 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamespaceExport(node) {
-        return node.kind === 266 /* NamespaceExport */;
+        return node.kind === 269 /* NamespaceExport */;
     }
     ts.isNamespaceExport = isNamespaceExport;
     function isNamedImports(node) {
-        return node.kind === 261 /* NamedImports */;
+        return node.kind === 264 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 262 /* ImportSpecifier */;
+        return node.kind === 265 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 263 /* ExportAssignment */;
+        return node.kind === 266 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 264 /* ExportDeclaration */;
+        return node.kind === 267 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 265 /* NamedExports */;
+        return node.kind === 268 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 267 /* ExportSpecifier */;
+        return node.kind === 270 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 268 /* MissingDeclaration */;
+        return node.kind === 271 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     function isNotEmittedStatement(node) {
-        return node.kind === 330 /* NotEmittedStatement */;
+        return node.kind === 335 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
     function isSyntheticReference(node) {
-        return node.kind === 335 /* SyntheticReferenceExpression */;
+        return node.kind === 340 /* SyntheticReferenceExpression */;
     }
     ts.isSyntheticReference = isSyntheticReference;
     /* @internal */
     function isMergeDeclarationMarker(node) {
-        return node.kind === 333 /* MergeDeclarationMarker */;
+        return node.kind === 338 /* MergeDeclarationMarker */;
     }
     ts.isMergeDeclarationMarker = isMergeDeclarationMarker;
     /* @internal */
     function isEndOfDeclarationMarker(node) {
-        return node.kind === 334 /* EndOfDeclarationMarker */;
+        return node.kind === 339 /* EndOfDeclarationMarker */;
     }
     ts.isEndOfDeclarationMarker = isEndOfDeclarationMarker;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 269 /* ExternalModuleReference */;
+        return node.kind === 272 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 270 /* JsxElement */;
+        return node.kind === 273 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 271 /* JsxSelfClosingElement */;
+        return node.kind === 274 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 272 /* JsxOpeningElement */;
+        return node.kind === 275 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 273 /* JsxClosingElement */;
+        return node.kind === 276 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 274 /* JsxFragment */;
+        return node.kind === 277 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 275 /* JsxOpeningFragment */;
+        return node.kind === 278 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 276 /* JsxClosingFragment */;
+        return node.kind === 279 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 277 /* JsxAttribute */;
+        return node.kind === 280 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 278 /* JsxAttributes */;
+        return node.kind === 281 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 279 /* JsxSpreadAttribute */;
+        return node.kind === 282 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 280 /* JsxExpression */;
+        return node.kind === 283 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 281 /* CaseClause */;
+        return node.kind === 284 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 282 /* DefaultClause */;
+        return node.kind === 285 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 283 /* HeritageClause */;
+        return node.kind === 286 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 284 /* CatchClause */;
+        return node.kind === 287 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 285 /* PropertyAssignment */;
+        return node.kind === 288 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 286 /* ShorthandPropertyAssignment */;
+        return node.kind === 289 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 287 /* SpreadAssignment */;
+        return node.kind === 290 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 288 /* EnumMember */;
+        return node.kind === 291 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Unparsed
     // TODO(rbuckton): isUnparsedPrologue
     function isUnparsedPrepend(node) {
-        return node.kind === 290 /* UnparsedPrepend */;
+        return node.kind === 293 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     // TODO(rbuckton): isUnparsedText
@@ -26127,148 +26950,152 @@ var ts;
     // TODO(rbuckton): isUnparsedSyntheticReference
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 294 /* SourceFile */;
+        return node.kind === 297 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 295 /* Bundle */;
+        return node.kind === 298 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 296 /* UnparsedSource */;
+        return node.kind === 299 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     // TODO(rbuckton): isInputFiles
     // JSDoc Elements
     function isJSDocTypeExpression(node) {
-        return node.kind === 298 /* JSDocTypeExpression */;
+        return node.kind === 301 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
+    function isJSDocNameReference(node) {
+        return node.kind === 302 /* JSDocNameReference */;
+    }
+    ts.isJSDocNameReference = isJSDocNameReference;
     function isJSDocAllType(node) {
-        return node.kind === 299 /* JSDocAllType */;
+        return node.kind === 303 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 300 /* JSDocUnknownType */;
+        return node.kind === 304 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 301 /* JSDocNullableType */;
+        return node.kind === 305 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 302 /* JSDocNonNullableType */;
+        return node.kind === 306 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 303 /* JSDocOptionalType */;
+        return node.kind === 307 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 304 /* JSDocFunctionType */;
+        return node.kind === 308 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 305 /* JSDocVariadicType */;
+        return node.kind === 309 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDocNamepathType(node) {
-        return node.kind === 306 /* JSDocNamepathType */;
+        return node.kind === 310 /* JSDocNamepathType */;
     }
     ts.isJSDocNamepathType = isJSDocNamepathType;
     function isJSDoc(node) {
-        return node.kind === 307 /* JSDocComment */;
+        return node.kind === 311 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 308 /* JSDocTypeLiteral */;
+        return node.kind === 312 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocSignature(node) {
-        return node.kind === 309 /* JSDocSignature */;
+        return node.kind === 313 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
     // JSDoc Tags
     function isJSDocAugmentsTag(node) {
-        return node.kind === 311 /* JSDocAugmentsTag */;
+        return node.kind === 315 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocAuthorTag(node) {
-        return node.kind === 313 /* JSDocAuthorTag */;
+        return node.kind === 317 /* JSDocAuthorTag */;
     }
     ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocClassTag(node) {
-        return node.kind === 315 /* JSDocClassTag */;
+        return node.kind === 319 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocCallbackTag(node) {
-        return node.kind === 320 /* JSDocCallbackTag */;
+        return node.kind === 324 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocPublicTag(node) {
-        return node.kind === 316 /* JSDocPublicTag */;
+        return node.kind === 320 /* JSDocPublicTag */;
     }
     ts.isJSDocPublicTag = isJSDocPublicTag;
     function isJSDocPrivateTag(node) {
-        return node.kind === 317 /* JSDocPrivateTag */;
+        return node.kind === 321 /* JSDocPrivateTag */;
     }
     ts.isJSDocPrivateTag = isJSDocPrivateTag;
     function isJSDocProtectedTag(node) {
-        return node.kind === 318 /* JSDocProtectedTag */;
+        return node.kind === 322 /* JSDocProtectedTag */;
     }
     ts.isJSDocProtectedTag = isJSDocProtectedTag;
     function isJSDocReadonlyTag(node) {
-        return node.kind === 319 /* JSDocReadonlyTag */;
+        return node.kind === 323 /* JSDocReadonlyTag */;
     }
     ts.isJSDocReadonlyTag = isJSDocReadonlyTag;
     function isJSDocDeprecatedTag(node) {
-        return node.kind === 314 /* JSDocDeprecatedTag */;
+        return node.kind === 318 /* JSDocDeprecatedTag */;
     }
     ts.isJSDocDeprecatedTag = isJSDocDeprecatedTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 321 /* JSDocEnumTag */;
+        return node.kind === 325 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 322 /* JSDocParameterTag */;
+        return node.kind === 326 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 323 /* JSDocReturnTag */;
+        return node.kind === 327 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocThisTag(node) {
-        return node.kind === 324 /* JSDocThisTag */;
+        return node.kind === 328 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 325 /* JSDocTypeTag */;
+        return node.kind === 329 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 326 /* JSDocTemplateTag */;
+        return node.kind === 330 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 327 /* JSDocTypedefTag */;
+        return node.kind === 331 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocUnknownTag(node) {
-        return node.kind === 310 /* JSDocTag */;
+        return node.kind === 314 /* JSDocTag */;
     }
     ts.isJSDocUnknownTag = isJSDocUnknownTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 328 /* JSDocPropertyTag */;
+        return node.kind === 333 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocImplementsTag(node) {
-        return node.kind === 312 /* JSDocImplementsTag */;
+        return node.kind === 316 /* JSDocImplementsTag */;
     }
     ts.isJSDocImplementsTag = isJSDocImplementsTag;
     // Synthesized list
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 329 /* SyntaxList */;
+        return n.kind === 334 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
 })(ts || (ts = {}));
@@ -26319,12 +27146,13 @@ var ts;
             createJsxFactoryExpressionFromEntityName(factory, jsxFactoryEntity, parent) :
             factory.createPropertyAccessExpression(createReactNamespace(reactNamespace, parent), "createElement");
     }
+    ts.createJsxFactoryExpression = createJsxFactoryExpression;
     function createJsxFragmentFactoryExpression(factory, jsxFragmentFactoryEntity, reactNamespace, parent) {
         return jsxFragmentFactoryEntity ?
             createJsxFactoryExpressionFromEntityName(factory, jsxFragmentFactoryEntity, parent) :
             factory.createPropertyAccessExpression(createReactNamespace(reactNamespace, parent), "Fragment");
     }
-    function createExpressionForJsxElement(factory, jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
+    function createExpressionForJsxElement(factory, callee, tagName, props, children, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -26344,7 +27172,7 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return ts.setTextRange(factory.createCallExpression(createJsxFactoryExpression(factory, jsxFactoryEntity, reactNamespace, parentElement), 
+        return ts.setTextRange(factory.createCallExpression(callee, 
         /*typeArguments*/ undefined, argumentsList), location);
     }
     ts.createExpressionForJsxElement = createExpressionForJsxElement;
@@ -26466,14 +27294,14 @@ var ts;
             ts.Debug.failBadSyntaxKind(property.name, "Private identifiers are not allowed in object literals.");
         }
         switch (property.kind) {
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(factory, node.properties, property, receiver, !!node.multiLine);
-            case 285 /* PropertyAssignment */:
+            case 288 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(factory, property, receiver);
-            case 286 /* ShorthandPropertyAssignment */:
+            case 289 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(factory, property, receiver);
-            case 164 /* MethodDeclaration */:
+            case 165 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(factory, property, receiver);
         }
     }
@@ -26526,21 +27354,21 @@ var ts;
     }
     ts.startsWithUseStrict = startsWithUseStrict;
     function isCommaSequence(node) {
-        return node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 332 /* CommaListExpression */;
+        return node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 337 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 15 /* All */; }
         switch (node.kind) {
-            case 204 /* ParenthesizedExpression */:
+            case 207 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 203 /* TypeAssertionExpression */:
-            case 221 /* AsExpression */:
+            case 206 /* TypeAssertionExpression */:
+            case 224 /* AsExpression */:
                 return (kinds & 2 /* TypeAssertions */) !== 0;
-            case 222 /* NonNullExpression */:
+            case 225 /* NonNullExpression */:
                 return (kinds & 4 /* NonNullAssertions */) !== 0;
-            case 331 /* PartiallyEmittedExpression */:
+            case 336 /* PartiallyEmittedExpression */:
                 return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -26657,14 +27485,14 @@ var ts;
      */
     function getLocalNameForExternalImport(factory, node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
-        if (namespaceDeclaration && !ts.isDefaultImport(node)) {
+        if (namespaceDeclaration && !ts.isDefaultImport(node) && !ts.isExportNamespaceAsDefaultDeclaration(node)) {
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : factory.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 258 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 261 /* ImportDeclaration */ && node.importClause) {
             return factory.getGeneratedNameForNode(node);
         }
-        if (node.kind === 264 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 267 /* ExportDeclaration */ && node.moduleSpecifier) {
             return factory.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -26783,7 +27611,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -26795,11 +27623,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 287 /* SpreadAssignment */:
+                case 290 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -26831,12 +27659,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 159 /* Parameter */:
-            case 195 /* BindingElement */:
+            case 160 /* Parameter */:
+            case 198 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 217 /* SpreadElement */:
-            case 287 /* SpreadAssignment */:
+            case 220 /* SpreadElement */:
+            case 290 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -26854,7 +27682,7 @@ var ts;
     ts.getPropertyNameOfBindingOrAssignmentElement = getPropertyNameOfBindingOrAssignmentElement;
     function tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 195 /* BindingElement */:
+            case 198 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -26869,7 +27697,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 285 /* PropertyAssignment */:
+            case 288 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -26884,7 +27712,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 287 /* SpreadAssignment */:
+            case 290 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 if (bindingElement.name && ts.isPrivateIdentifier(bindingElement.name)) {
                     return ts.Debug.failBadSyntaxKind(bindingElement.name);
@@ -26907,13 +27735,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 193 /* ObjectBindingPattern */:
-            case 194 /* ArrayBindingPattern */:
-            case 196 /* ArrayLiteralExpression */:
+            case 196 /* ObjectBindingPattern */:
+            case 197 /* ArrayBindingPattern */:
+            case 199 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 197 /* ObjectLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -26934,29 +27762,29 @@ var ts;
     ts.getJSDocTypeAliasName = getJSDocTypeAliasName;
     function canHaveModifiers(node) {
         var kind = node.kind;
-        return kind === 159 /* Parameter */
-            || kind === 161 /* PropertySignature */
-            || kind === 162 /* PropertyDeclaration */
-            || kind === 163 /* MethodSignature */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 165 /* Constructor */
-            || kind === 166 /* GetAccessor */
-            || kind === 167 /* SetAccessor */
-            || kind === 170 /* IndexSignature */
-            || kind === 205 /* FunctionExpression */
-            || kind === 206 /* ArrowFunction */
-            || kind === 218 /* ClassExpression */
-            || kind === 229 /* VariableStatement */
-            || kind === 248 /* FunctionDeclaration */
-            || kind === 249 /* ClassDeclaration */
-            || kind === 250 /* InterfaceDeclaration */
-            || kind === 251 /* TypeAliasDeclaration */
-            || kind === 252 /* EnumDeclaration */
-            || kind === 253 /* ModuleDeclaration */
-            || kind === 257 /* ImportEqualsDeclaration */
-            || kind === 258 /* ImportDeclaration */
-            || kind === 263 /* ExportAssignment */
-            || kind === 264 /* ExportDeclaration */;
+        return kind === 160 /* Parameter */
+            || kind === 162 /* PropertySignature */
+            || kind === 163 /* PropertyDeclaration */
+            || kind === 164 /* MethodSignature */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 166 /* Constructor */
+            || kind === 167 /* GetAccessor */
+            || kind === 168 /* SetAccessor */
+            || kind === 171 /* IndexSignature */
+            || kind === 208 /* FunctionExpression */
+            || kind === 209 /* ArrowFunction */
+            || kind === 221 /* ClassExpression */
+            || kind === 232 /* VariableStatement */
+            || kind === 251 /* FunctionDeclaration */
+            || kind === 252 /* ClassDeclaration */
+            || kind === 253 /* InterfaceDeclaration */
+            || kind === 254 /* TypeAliasDeclaration */
+            || kind === 255 /* EnumDeclaration */
+            || kind === 256 /* ModuleDeclaration */
+            || kind === 260 /* ImportEqualsDeclaration */
+            || kind === 261 /* ImportDeclaration */
+            || kind === 266 /* ExportAssignment */
+            || kind === 267 /* ExportDeclaration */;
     }
     ts.canHaveModifiers = canHaveModifiers;
     /* @internal */
@@ -27055,19 +27883,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 <= 155 /* LastToken */) {
+        if (!node || node.kind <= 156 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 158 /* TypeParameter */:
+            case 159 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 286 /* ShorthandPropertyAssignment */:
+            case 289 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -27075,9 +27903,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 287 /* SpreadAssignment */:
+            case 290 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 159 /* Parameter */:
+            case 160 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -27085,7 +27913,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 162 /* PropertyDeclaration */:
+            case 163 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -27093,51 +27921,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 161 /* PropertySignature */:
+            case 162 /* 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 285 /* PropertyAssignment */:
+            case 288 /* 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 246 /* VariableDeclaration */:
+            case 249 /* 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 195 /* BindingElement */:
+            case 198 /* 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 173 /* FunctionType */:
-            case 174 /* ConstructorType */:
-            case 168 /* CallSignature */:
-            case 169 /* ConstructSignature */:
-            case 170 /* IndexSignature */:
+            case 174 /* FunctionType */:
+            case 175 /* ConstructorType */:
+            case 169 /* CallSignature */:
+            case 170 /* ConstructSignature */:
+            case 171 /* 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 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 205 /* FunctionExpression */:
-            case 248 /* FunctionDeclaration */:
-            case 206 /* ArrowFunction */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 208 /* FunctionExpression */:
+            case 251 /* FunctionDeclaration */:
+            case 209 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -27149,364 +27977,374 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 172 /* TypeReference */:
+            case 173 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 171 /* TypePredicate */:
+            case 172 /* TypePredicate */:
                 return visitNode(cbNode, node.assertsModifier) ||
                     visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 175 /* TypeQuery */:
+            case 176 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 176 /* TypeLiteral */:
+            case 177 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 177 /* ArrayType */:
+            case 178 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 178 /* TupleType */:
+            case 179 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 181 /* UnionType */:
-            case 182 /* IntersectionType */:
+            case 182 /* UnionType */:
+            case 183 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 183 /* ConditionalType */:
+            case 184 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 184 /* InferType */:
+            case 185 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 192 /* ImportType */:
+            case 195 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 185 /* ParenthesizedType */:
-            case 187 /* TypeOperator */:
+            case 186 /* ParenthesizedType */:
+            case 188 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 188 /* IndexedAccessType */:
+            case 189 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 189 /* MappedType */:
+            case 190 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.nameType) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 190 /* LiteralType */:
+            case 191 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 191 /* NamedTupleMember */:
+            case 192 /* NamedTupleMember */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 193 /* ObjectBindingPattern */:
-            case 194 /* ArrayBindingPattern */:
+            case 196 /* ObjectBindingPattern */:
+            case 197 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 196 /* ArrayLiteralExpression */:
+            case 199 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 197 /* ObjectLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 198 /* PropertyAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNode(cbNode, node.name);
-            case 199 /* ElementAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 200 /* CallExpression */:
-            case 201 /* NewExpression */:
+            case 203 /* CallExpression */:
+            case 204 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 202 /* TaggedTemplateExpression */:
+            case 205 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 203 /* TypeAssertionExpression */:
+            case 206 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 204 /* ParenthesizedExpression */:
+            case 207 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 207 /* DeleteExpression */:
+            case 210 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 208 /* TypeOfExpression */:
+            case 211 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 209 /* VoidExpression */:
+            case 212 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 211 /* PrefixUnaryExpression */:
+            case 214 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 216 /* YieldExpression */:
+            case 219 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 210 /* AwaitExpression */:
+            case 213 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 212 /* PostfixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 221 /* AsExpression */:
+            case 224 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 222 /* NonNullExpression */:
+            case 225 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 223 /* MetaProperty */:
+            case 226 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 214 /* ConditionalExpression */:
+            case 217 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 217 /* SpreadElement */:
+            case 220 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 227 /* Block */:
-            case 254 /* ModuleBlock */:
+            case 230 /* Block */:
+            case 257 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 294 /* SourceFile */:
+            case 297 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 229 /* VariableStatement */:
+            case 232 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 247 /* VariableDeclarationList */:
+            case 250 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 230 /* ExpressionStatement */:
+            case 233 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* IfStatement */:
+            case 234 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 232 /* DoStatement */:
+            case 235 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 233 /* WhileStatement */:
+            case 236 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ForStatement */:
+            case 237 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 235 /* ForInStatement */:
+            case 238 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 236 /* ForOfStatement */:
+            case 239 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 237 /* ContinueStatement */:
-            case 238 /* BreakStatement */:
+            case 240 /* ContinueStatement */:
+            case 241 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 239 /* ReturnStatement */:
+            case 242 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* WithStatement */:
+            case 243 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 241 /* SwitchStatement */:
+            case 244 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 255 /* CaseBlock */:
+            case 258 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 281 /* CaseClause */:
+            case 284 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 282 /* DefaultClause */:
+            case 285 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 242 /* LabeledStatement */:
+            case 245 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 243 /* ThrowStatement */:
+            case 246 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 244 /* TryStatement */:
+            case 247 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 284 /* CatchClause */:
+            case 287 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 160 /* Decorator */:
+            case 161 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* 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 250 /* InterfaceDeclaration */:
+            case 253 /* 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 251 /* TypeAliasDeclaration */:
+            case 254 /* 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 252 /* EnumDeclaration */:
+            case 255 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 288 /* EnumMember */:
+            case 291 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 257 /* ImportEqualsDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 258 /* ImportDeclaration */:
+            case 261 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 259 /* ImportClause */:
+            case 262 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 256 /* NamespaceExportDeclaration */:
+            case 259 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 260 /* NamespaceImport */:
+            case 263 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 266 /* NamespaceExport */:
+            case 269 /* NamespaceExport */:
                 return visitNode(cbNode, node.name);
-            case 261 /* NamedImports */:
-            case 265 /* NamedExports */:
+            case 264 /* NamedImports */:
+            case 268 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 264 /* ExportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 262 /* ImportSpecifier */:
-            case 267 /* ExportSpecifier */:
+            case 265 /* ImportSpecifier */:
+            case 270 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 263 /* ExportAssignment */:
+            case 266 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 215 /* TemplateExpression */:
+            case 218 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 225 /* TemplateSpan */:
+            case 228 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 157 /* ComputedPropertyName */:
+            case 193 /* TemplateLiteralType */:
+                return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
+            case 194 /* TemplateLiteralTypeSpan */:
+                return visitNode(cbNode, node.type) || visitNode(cbNode, node.literal);
+            case 158 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 283 /* HeritageClause */:
+            case 286 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 220 /* ExpressionWithTypeArguments */:
+            case 223 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 269 /* ExternalModuleReference */:
+            case 272 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 268 /* MissingDeclaration */:
+            case 271 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 332 /* CommaListExpression */:
+            case 337 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 270 /* JsxElement */:
+            case 273 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 274 /* JsxFragment */:
+            case 277 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 271 /* JsxSelfClosingElement */:
-            case 272 /* JsxOpeningElement */:
+            case 274 /* JsxSelfClosingElement */:
+            case 275 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 278 /* JsxAttributes */:
+            case 281 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 277 /* JsxAttribute */:
+            case 280 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 279 /* JsxSpreadAttribute */:
+            case 282 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 280 /* JsxExpression */:
+            case 283 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 273 /* JsxClosingElement */:
+            case 276 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 179 /* OptionalType */:
-            case 180 /* RestType */:
-            case 298 /* JSDocTypeExpression */:
-            case 302 /* JSDocNonNullableType */:
-            case 301 /* JSDocNullableType */:
-            case 303 /* JSDocOptionalType */:
-            case 305 /* JSDocVariadicType */:
+            case 180 /* OptionalType */:
+            case 181 /* RestType */:
+            case 301 /* JSDocTypeExpression */:
+            case 306 /* JSDocNonNullableType */:
+            case 305 /* JSDocNullableType */:
+            case 307 /* JSDocOptionalType */:
+            case 309 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 304 /* JSDocFunctionType */:
+            case 308 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 307 /* JSDocComment */:
+            case 311 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 322 /* JSDocParameterTag */:
-            case 328 /* JSDocPropertyTag */:
+            case 332 /* JSDocSeeTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.name);
+            case 302 /* JSDocNameReference */:
+                return visitNode(cbNode, node.name);
+            case 326 /* JSDocParameterTag */:
+            case 333 /* 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 313 /* JSDocAuthorTag */:
+            case 317 /* JSDocAuthorTag */:
                 return visitNode(cbNode, node.tagName);
-            case 312 /* JSDocImplementsTag */:
+            case 316 /* JSDocImplementsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 311 /* JSDocAugmentsTag */:
+            case 315 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 326 /* JSDocTemplateTag */:
+            case 330 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 327 /* JSDocTypedefTag */:
+            case 331 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 298 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 301 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 320 /* JSDocCallbackTag */:
+            case 324 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 323 /* JSDocReturnTag */:
-            case 325 /* JSDocTypeTag */:
-            case 324 /* JSDocThisTag */:
-            case 321 /* JSDocEnumTag */:
+            case 327 /* JSDocReturnTag */:
+            case 329 /* JSDocTypeTag */:
+            case 328 /* JSDocThisTag */:
+            case 325 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 309 /* JSDocSignature */:
+            case 313 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 308 /* JSDocTypeLiteral */:
+            case 312 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 310 /* JSDocTag */:
-            case 315 /* JSDocClassTag */:
-            case 316 /* JSDocPublicTag */:
-            case 317 /* JSDocPrivateTag */:
-            case 318 /* JSDocProtectedTag */:
-            case 319 /* JSDocReadonlyTag */:
+            case 314 /* JSDocTag */:
+            case 319 /* JSDocClassTag */:
+            case 320 /* JSDocPublicTag */:
+            case 321 /* JSDocPrivateTag */:
+            case 322 /* JSDocProtectedTag */:
+            case 323 /* JSDocReadonlyTag */:
                 return visitNode(cbNode, node.tagName);
-            case 331 /* PartiallyEmittedExpression */:
+            case 336 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -27581,6 +28419,8 @@ var ts;
     ts.forEachChildRecursively = forEachChildRecursively;
     function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
+        var tracingData = ["parse" /* Parse */, "createSourceFile", { path: fileName }];
+        ts.tracing.begin.apply(ts.tracing, tracingData);
         ts.performance.mark("beforeParse");
         var result;
         ts.perfLogger.logStartParseSourceFile(fileName);
@@ -27593,6 +28433,7 @@ var ts;
         ts.perfLogger.logStopParseSourceFile();
         ts.performance.mark("afterParse");
         ts.performance.measure("Parse", "beforeParse", "afterParse");
+        ts.tracing.end.apply(ts.tracing, tracingData);
         return result;
     }
     ts.createSourceFile = createSourceFile;
@@ -28453,7 +29294,7 @@ var ts;
                 ts.isTemplateLiteralKind(kind) ? factory.createTemplateLiteralLikeNode(kind, "", "", /*templateFlags*/ undefined) :
                     kind === 8 /* NumericLiteral */ ? factory.createNumericLiteral("", /*numericLiteralFlags*/ undefined) :
                         kind === 10 /* StringLiteral */ ? factory.createStringLiteral("", /*isSingleQuote*/ undefined) :
-                            kind === 268 /* MissingDeclaration */ ? factory.createMissingDeclaration() :
+                            kind === 271 /* MissingDeclaration */ ? factory.createMissingDeclaration() :
                                 factory.createToken(kind);
             return finishNode(result, pos);
         }
@@ -28567,7 +29408,7 @@ var ts;
                     if (token() === 87 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    if (token() === 148 /* TypeKeyword */) {
+                    if (token() === 149 /* TypeKeyword */) {
                         return lookAhead(nextTokenCanFollowExportModifier);
                     }
                     return canFollowExportModifier();
@@ -28575,7 +29416,7 @@ var ts;
                     return nextTokenCanFollowDefaultKeyword();
                 case 123 /* StaticKeyword */:
                 case 134 /* GetKeyword */:
-                case 145 /* SetKeyword */:
+                case 146 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -28985,14 +29826,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 165 /* Constructor */:
-                    case 170 /* IndexSignature */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 162 /* PropertyDeclaration */:
-                    case 226 /* SemicolonClassElement */:
+                    case 166 /* Constructor */:
+                    case 171 /* IndexSignature */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 163 /* PropertyDeclaration */:
+                    case 229 /* SemicolonClassElement */:
                         return true;
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* 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.
@@ -29007,8 +29848,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 281 /* CaseClause */:
-                    case 282 /* DefaultClause */:
+                    case 284 /* CaseClause */:
+                    case 285 /* DefaultClause */:
                         return true;
                 }
             }
@@ -29017,58 +29858,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 248 /* FunctionDeclaration */:
-                    case 229 /* VariableStatement */:
-                    case 227 /* Block */:
-                    case 231 /* IfStatement */:
-                    case 230 /* ExpressionStatement */:
-                    case 243 /* ThrowStatement */:
-                    case 239 /* ReturnStatement */:
-                    case 241 /* SwitchStatement */:
-                    case 238 /* BreakStatement */:
-                    case 237 /* ContinueStatement */:
-                    case 235 /* ForInStatement */:
-                    case 236 /* ForOfStatement */:
-                    case 234 /* ForStatement */:
-                    case 233 /* WhileStatement */:
-                    case 240 /* WithStatement */:
-                    case 228 /* EmptyStatement */:
-                    case 244 /* TryStatement */:
-                    case 242 /* LabeledStatement */:
-                    case 232 /* DoStatement */:
-                    case 245 /* DebuggerStatement */:
-                    case 258 /* ImportDeclaration */:
-                    case 257 /* ImportEqualsDeclaration */:
-                    case 264 /* ExportDeclaration */:
-                    case 263 /* ExportAssignment */:
-                    case 253 /* ModuleDeclaration */:
-                    case 249 /* ClassDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 252 /* EnumDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
+                    case 251 /* FunctionDeclaration */:
+                    case 232 /* VariableStatement */:
+                    case 230 /* Block */:
+                    case 234 /* IfStatement */:
+                    case 233 /* ExpressionStatement */:
+                    case 246 /* ThrowStatement */:
+                    case 242 /* ReturnStatement */:
+                    case 244 /* SwitchStatement */:
+                    case 241 /* BreakStatement */:
+                    case 240 /* ContinueStatement */:
+                    case 238 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
+                    case 237 /* ForStatement */:
+                    case 236 /* WhileStatement */:
+                    case 243 /* WithStatement */:
+                    case 231 /* EmptyStatement */:
+                    case 247 /* TryStatement */:
+                    case 245 /* LabeledStatement */:
+                    case 235 /* DoStatement */:
+                    case 248 /* DebuggerStatement */:
+                    case 261 /* ImportDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
+                    case 267 /* ExportDeclaration */:
+                    case 266 /* ExportAssignment */:
+                    case 256 /* ModuleDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 288 /* EnumMember */;
+            return node.kind === 291 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 169 /* ConstructSignature */:
-                    case 163 /* MethodSignature */:
-                    case 170 /* IndexSignature */:
-                    case 161 /* PropertySignature */:
-                    case 168 /* CallSignature */:
+                    case 170 /* ConstructSignature */:
+                    case 164 /* MethodSignature */:
+                    case 171 /* IndexSignature */:
+                    case 162 /* PropertySignature */:
+                    case 169 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 246 /* VariableDeclaration */) {
+            if (node.kind !== 249 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -29089,7 +29930,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 159 /* Parameter */) {
+            if (node.kind !== 160 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -29098,7 +29939,7 @@ var ts;
         }
         // Returns true if we should abort parsing.
         function abortParsingListOrMoveToNextToken(kind) {
-            parseErrorAtCurrentToken(parsingContextErrors(kind));
+            parsingContextErrors(kind);
             if (isInSomeParsingContext()) {
                 return true;
             }
@@ -29107,31 +29948,34 @@ var ts;
         }
         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 0 /* SourceElements */: return parseErrorAtCurrentToken(ts.Diagnostics.Declaration_or_statement_expected);
+                case 1 /* BlockStatements */: return parseErrorAtCurrentToken(ts.Diagnostics.Declaration_or_statement_expected);
+                case 2 /* SwitchClauses */: return parseErrorAtCurrentToken(ts.Diagnostics.case_or_default_expected);
+                case 3 /* SwitchClauseStatements */: return parseErrorAtCurrentToken(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);`
+                case 4 /* TypeMembers */: return parseErrorAtCurrentToken(ts.Diagnostics.Property_or_signature_expected);
+                case 5 /* ClassMembers */: return parseErrorAtCurrentToken(ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected);
+                case 6 /* EnumMembers */: return parseErrorAtCurrentToken(ts.Diagnostics.Enum_member_expected);
+                case 7 /* HeritageClauseElement */: return parseErrorAtCurrentToken(ts.Diagnostics.Expression_expected);
+                case 8 /* VariableDeclarations */:
+                    return ts.isKeyword(token())
+                        ? parseErrorAtCurrentToken(ts.Diagnostics._0_is_not_allowed_as_a_variable_declaration_name, ts.tokenToString(token()))
+                        : parseErrorAtCurrentToken(ts.Diagnostics.Variable_declaration_expected);
+                case 9 /* ObjectBindingElements */: return parseErrorAtCurrentToken(ts.Diagnostics.Property_destructuring_pattern_expected);
+                case 10 /* ArrayBindingElements */: return parseErrorAtCurrentToken(ts.Diagnostics.Array_element_destructuring_pattern_expected);
+                case 11 /* ArgumentExpressions */: return parseErrorAtCurrentToken(ts.Diagnostics.Argument_expression_expected);
+                case 12 /* ObjectLiteralMembers */: return parseErrorAtCurrentToken(ts.Diagnostics.Property_assignment_expected);
+                case 15 /* ArrayLiteralMembers */: return parseErrorAtCurrentToken(ts.Diagnostics.Expression_or_comma_expected);
+                case 17 /* JSDocParameters */: return parseErrorAtCurrentToken(ts.Diagnostics.Parameter_declaration_expected);
+                case 16 /* Parameters */: return parseErrorAtCurrentToken(ts.Diagnostics.Parameter_declaration_expected);
+                case 19 /* TypeParameters */: return parseErrorAtCurrentToken(ts.Diagnostics.Type_parameter_declaration_expected);
+                case 20 /* TypeArguments */: return parseErrorAtCurrentToken(ts.Diagnostics.Type_argument_expected);
+                case 21 /* TupleElementTypes */: return parseErrorAtCurrentToken(ts.Diagnostics.Type_expected);
+                case 22 /* HeritageClauses */: return parseErrorAtCurrentToken(ts.Diagnostics.Unexpected_token_expected);
+                case 23 /* ImportOrExportSpecifiers */: return parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
+                case 13 /* JsxAttributes */: return parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
+                case 14 /* JsxChildren */: return parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
+                default: return [undefined]; // TODO: GH#18217 `default: Debug.assertNever(context);`
             }
         }
         // Parses a comma-delimited list of elements
@@ -29276,6 +30120,24 @@ var ts;
             var pos = getNodePos();
             return finishNode(factory.createTemplateExpression(parseTemplateHead(isTaggedTemplate), parseTemplateSpans(isTaggedTemplate)), pos);
         }
+        function parseTemplateType() {
+            var pos = getNodePos();
+            return finishNode(factory.createTemplateLiteralType(parseTemplateHead(/*isTaggedTemplate*/ false), parseTemplateTypeSpans()), pos);
+        }
+        function parseTemplateTypeSpans() {
+            var pos = getNodePos();
+            var list = [];
+            var node;
+            do {
+                node = parseTemplateTypeSpan();
+                list.push(node);
+            } while (node.literal.kind === 16 /* TemplateMiddle */);
+            return createNodeArray(list, pos);
+        }
+        function parseTemplateTypeSpan() {
+            var pos = getNodePos();
+            return finishNode(factory.createTemplateLiteralTypeSpan(parseType(), parseLiteralOfTemplateSpan(/*isTaggedTemplate*/ false)), pos);
+        }
         function parseLiteralOfTemplateSpan(isTaggedTemplate) {
             if (token() === 19 /* CloseBraceToken */) {
                 reScanTemplateToken(isTaggedTemplate);
@@ -29349,14 +30211,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 173 /* FunctionType */:
-                case 174 /* ConstructorType */: {
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 185 /* ParenthesizedType */:
+                case 186 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -29436,7 +30298,7 @@ var ts;
         function parseJSDocType() {
             scanner.setInJSDocType(true);
             var pos = getNodePos();
-            if (parseOptional(138 /* ModuleKeyword */)) {
+            if (parseOptional(139 /* ModuleKeyword */)) {
                 // TODO(rbuckton): We never set the type for a JSDocNamepathType. What should we put here?
                 var moduleTag = factory.createJSDocNamepathType(/*type*/ undefined);
                 terminate: while (true) {
@@ -29636,14 +30498,14 @@ var ts;
         function parseSignatureMember(kind) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
-            if (kind === 169 /* ConstructSignature */) {
+            if (kind === 170 /* ConstructSignature */) {
                 parseExpected(102 /* NewKeyword */);
             }
             var typeParameters = parseTypeParameters();
             var parameters = parseParameters(4 /* Type */);
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ true);
             parseTypeMemberSemicolon();
-            var node = kind === 168 /* CallSignature */
+            var node = kind === 169 /* CallSignature */
                 ? factory.createCallSignature(typeParameters, parameters, type)
                 : factory.createConstructSignature(typeParameters, parameters, type);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
@@ -29766,10 +30628,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) {
-                return parseSignatureMember(168 /* CallSignature */);
+                return parseSignatureMember(169 /* CallSignature */);
             }
             if (token() === 102 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(169 /* ConstructSignature */);
+                return parseSignatureMember(170 /* ConstructSignature */);
             }
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
@@ -29813,9 +30675,9 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) {
-                return nextToken() === 141 /* ReadonlyKeyword */;
+                return nextToken() === 142 /* ReadonlyKeyword */;
             }
-            if (token() === 141 /* ReadonlyKeyword */) {
+            if (token() === 142 /* ReadonlyKeyword */) {
                 nextToken();
             }
             return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 100 /* InKeyword */;
@@ -29831,14 +30693,15 @@ var ts;
             var pos = getNodePos();
             parseExpected(18 /* OpenBraceToken */);
             var readonlyToken;
-            if (token() === 141 /* ReadonlyKeyword */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) {
+            if (token() === 142 /* ReadonlyKeyword */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) {
                 readonlyToken = parseTokenNode();
-                if (readonlyToken.kind !== 141 /* ReadonlyKeyword */) {
-                    parseExpected(141 /* ReadonlyKeyword */);
+                if (readonlyToken.kind !== 142 /* ReadonlyKeyword */) {
+                    parseExpected(142 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
             var typeParameter = parseMappedTypeParameter();
+            var nameType = parseOptional(126 /* AsKeyword */) ? parseType() : undefined;
             parseExpected(23 /* CloseBracketToken */);
             var questionToken;
             if (token() === 57 /* QuestionToken */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) {
@@ -29850,7 +30713,7 @@ var ts;
             var type = parseTypeAnnotation();
             parseSemicolon();
             parseExpected(19 /* CloseBraceToken */);
-            return finishNode(factory.createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), pos);
+            return finishNode(factory.createMappedTypeNode(readonlyToken, typeParameter, nameType, questionToken, type), pos);
         }
         function parseTupleElementType() {
             var pos = getNodePos();
@@ -29952,15 +30815,15 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 128 /* AnyKeyword */:
-                case 151 /* UnknownKeyword */:
-                case 146 /* StringKeyword */:
-                case 143 /* NumberKeyword */:
-                case 154 /* BigIntKeyword */:
-                case 147 /* SymbolKeyword */:
+                case 152 /* UnknownKeyword */:
+                case 147 /* StringKeyword */:
+                case 144 /* NumberKeyword */:
+                case 155 /* BigIntKeyword */:
+                case 148 /* SymbolKeyword */:
                 case 131 /* BooleanKeyword */:
-                case 149 /* UndefinedKeyword */:
-                case 140 /* NeverKeyword */:
-                case 144 /* ObjectKeyword */:
+                case 150 /* UndefinedKeyword */:
+                case 141 /* NeverKeyword */:
+                case 145 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 65 /* AsteriskEqualsToken */:
@@ -29993,7 +30856,7 @@ var ts;
                     return parseTokenNode();
                 case 107 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 136 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 137 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
@@ -30012,6 +30875,8 @@ var ts;
                     return parseImportType();
                 case 127 /* AssertsKeyword */:
                     return lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine) ? parseAssertsTypePredicate() : parseTypeReference();
+                case 15 /* TemplateHead */:
+                    return parseTemplateType();
                 default:
                     return parseTypeReference();
             }
@@ -30019,20 +30884,20 @@ var ts;
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
                 case 128 /* AnyKeyword */:
-                case 151 /* UnknownKeyword */:
-                case 146 /* StringKeyword */:
-                case 143 /* NumberKeyword */:
-                case 154 /* BigIntKeyword */:
+                case 152 /* UnknownKeyword */:
+                case 147 /* StringKeyword */:
+                case 144 /* NumberKeyword */:
+                case 155 /* BigIntKeyword */:
                 case 131 /* BooleanKeyword */:
-                case 141 /* ReadonlyKeyword */:
-                case 147 /* SymbolKeyword */:
-                case 150 /* UniqueKeyword */:
+                case 142 /* ReadonlyKeyword */:
+                case 148 /* SymbolKeyword */:
+                case 151 /* UniqueKeyword */:
                 case 113 /* VoidKeyword */:
-                case 149 /* UndefinedKeyword */:
+                case 150 /* UndefinedKeyword */:
                 case 103 /* NullKeyword */:
                 case 107 /* ThisKeyword */:
                 case 111 /* TypeOfKeyword */:
-                case 140 /* NeverKeyword */:
+                case 141 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 29 /* LessThanToken */:
@@ -30044,7 +30909,7 @@ var ts;
                 case 9 /* BigIntLiteral */:
                 case 109 /* TrueKeyword */:
                 case 94 /* FalseKeyword */:
-                case 144 /* ObjectKeyword */:
+                case 145 /* ObjectKeyword */:
                 case 41 /* AsteriskToken */:
                 case 57 /* QuestionToken */:
                 case 53 /* ExclamationToken */:
@@ -30052,6 +30917,8 @@ var ts;
                 case 135 /* InferKeyword */:
                 case 99 /* ImportKeyword */:
                 case 127 /* AssertsKeyword */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 15 /* TemplateHead */:
                     return true;
                 case 97 /* FunctionKeyword */:
                     return !inStartOfParameter;
@@ -30123,9 +30990,9 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 137 /* KeyOfKeyword */:
-                case 150 /* UniqueKeyword */:
-                case 141 /* ReadonlyKeyword */:
+                case 138 /* KeyOfKeyword */:
+                case 151 /* UniqueKeyword */:
+                case 142 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
                 case 135 /* InferKeyword */:
                     return parseInferType();
@@ -30242,7 +31109,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 136 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 137 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -30251,7 +31118,7 @@ var ts;
             var pos = getNodePos();
             var assertsModifier = parseExpectedToken(127 /* AssertsKeyword */);
             var parameterName = token() === 107 /* ThisKeyword */ ? parseThisTypeNode() : parseIdentifier();
-            var type = parseOptional(136 /* IsKeyword */) ? parseType() : undefined;
+            var type = parseOptional(137 /* IsKeyword */) ? parseType() : undefined;
             return finishNode(factory.createTypePredicateNode(assertsModifier, parameterName, type), pos);
         }
         function parseType() {
@@ -30783,7 +31650,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand, pos);
         }
         function isInOrOfKeyword(t) {
-            return t === 100 /* InKeyword */ || t === 155 /* OfKeyword */;
+            return t === 100 /* InKeyword */ || t === 156 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand, pos) {
             while (true) {
@@ -30923,7 +31790,7 @@ var ts;
             if (token() === 42 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 203 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 206 /* 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 {
@@ -31174,7 +32041,7 @@ var ts;
             var pos = getNodePos();
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 272 /* JsxOpeningElement */) {
+            if (opening.kind === 275 /* JsxOpeningElement */) {
                 var children = parseJsxChildren(opening);
                 var closingElement = parseJsxClosingElement(inExpressionContext);
                 if (!tagNamesAreEquivalent(opening.tagName, closingElement.tagName)) {
@@ -31182,11 +32049,11 @@ var ts;
                 }
                 result = finishNode(factory.createJsxElement(opening, children, closingElement), pos);
             }
-            else if (opening.kind === 275 /* JsxOpeningFragment */) {
+            else if (opening.kind === 278 /* JsxOpeningFragment */) {
                 result = finishNode(factory.createJsxFragment(opening, parseJsxChildren(opening), parseJsxClosingFragment(inExpressionContext)), pos);
             }
             else {
-                ts.Debug.assert(opening.kind === 271 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 274 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -31681,10 +32548,10 @@ var ts;
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             if (parseContextualModifier(134 /* GetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 166 /* GetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* GetAccessor */);
             }
-            if (parseContextualModifier(145 /* SetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* SetAccessor */);
+            if (parseContextualModifier(146 /* SetKeyword */)) {
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(41 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -31895,7 +32762,7 @@ var ts;
                 }
             }
             var node;
-            if (awaitToken ? parseExpected(155 /* OfKeyword */) : parseOptional(155 /* OfKeyword */)) {
+            if (awaitToken ? parseExpected(156 /* OfKeyword */) : parseOptional(156 /* OfKeyword */)) {
                 var expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement());
@@ -31921,10 +32788,10 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var pos = getNodePos();
-            parseExpected(kind === 238 /* BreakStatement */ ? 80 /* BreakKeyword */ : 85 /* ContinueKeyword */);
+            parseExpected(kind === 241 /* BreakStatement */ ? 80 /* BreakKeyword */ : 85 /* ContinueKeyword */);
             var label = canParseSemicolon() ? undefined : parseIdentifier();
             parseSemicolon();
-            var node = kind === 238 /* BreakStatement */
+            var node = kind === 241 /* BreakStatement */
                 ? factory.createBreakStatement(label)
                 : factory.createContinueStatement(label);
             return finishNode(node, pos);
@@ -32103,10 +32970,10 @@ var ts;
                     //
                     // could be legal, it would add complexity for very little gain.
                     case 117 /* InterfaceKeyword */:
-                    case 148 /* TypeKeyword */:
+                    case 149 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 138 /* ModuleKeyword */:
-                    case 139 /* NamespaceKeyword */:
+                    case 139 /* ModuleKeyword */:
+                    case 140 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 125 /* AbstractKeyword */:
                     case 129 /* AsyncKeyword */:
@@ -32114,14 +32981,14 @@ var ts;
                     case 120 /* PrivateKeyword */:
                     case 121 /* ProtectedKeyword */:
                     case 122 /* PublicKeyword */:
-                    case 141 /* ReadonlyKeyword */:
+                    case 142 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 153 /* GlobalKeyword */:
+                    case 154 /* GlobalKeyword */:
                         nextToken();
                         return token() === 18 /* OpenBraceToken */ || token() === 78 /* Identifier */ || token() === 92 /* ExportKeyword */;
                     case 99 /* ImportKeyword */:
@@ -32130,7 +32997,7 @@ var ts;
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
                     case 92 /* ExportKeyword */:
                         var currentToken_1 = nextToken();
-                        if (currentToken_1 === 148 /* TypeKeyword */) {
+                        if (currentToken_1 === 149 /* TypeKeyword */) {
                             currentToken_1 = lookAhead(nextToken);
                         }
                         if (currentToken_1 === 62 /* EqualsToken */ || currentToken_1 === 41 /* AsteriskToken */ ||
@@ -32186,17 +33053,17 @@ var ts;
                 case 129 /* AsyncKeyword */:
                 case 133 /* DeclareKeyword */:
                 case 117 /* InterfaceKeyword */:
-                case 138 /* ModuleKeyword */:
-                case 139 /* NamespaceKeyword */:
-                case 148 /* TypeKeyword */:
-                case 153 /* GlobalKeyword */:
+                case 139 /* ModuleKeyword */:
+                case 140 /* NamespaceKeyword */:
+                case 149 /* TypeKeyword */:
+                case 154 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
                 case 122 /* PublicKeyword */:
                 case 120 /* PrivateKeyword */:
                 case 121 /* ProtectedKeyword */:
                 case 123 /* StaticKeyword */:
-                case 141 /* ReadonlyKeyword */:
+                case 142 /* 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);
@@ -32239,9 +33106,9 @@ var ts;
                 case 96 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 85 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(237 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(240 /* ContinueStatement */);
                 case 80 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(238 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(241 /* BreakStatement */);
                 case 104 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 115 /* WithKeyword */:
@@ -32262,9 +33129,9 @@ var ts;
                     return parseDeclaration();
                 case 129 /* AsyncKeyword */:
                 case 117 /* InterfaceKeyword */:
-                case 148 /* TypeKeyword */:
-                case 138 /* ModuleKeyword */:
-                case 139 /* NamespaceKeyword */:
+                case 149 /* TypeKeyword */:
+                case 139 /* ModuleKeyword */:
+                case 140 /* NamespaceKeyword */:
                 case 133 /* DeclareKeyword */:
                 case 84 /* ConstKeyword */:
                 case 91 /* EnumKeyword */:
@@ -32275,8 +33142,8 @@ var ts;
                 case 122 /* PublicKeyword */:
                 case 125 /* AbstractKeyword */:
                 case 123 /* StaticKeyword */:
-                case 141 /* ReadonlyKeyword */:
-                case 153 /* GlobalKeyword */:
+                case 142 /* ReadonlyKeyword */:
+                case 154 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -32336,13 +33203,13 @@ var ts;
                     return parseClassDeclaration(pos, hasJSDoc, decorators, modifiers);
                 case 117 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(pos, hasJSDoc, decorators, modifiers);
-                case 148 /* TypeKeyword */:
+                case 149 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(pos, hasJSDoc, decorators, modifiers);
                 case 91 /* EnumKeyword */:
                     return parseEnumDeclaration(pos, hasJSDoc, decorators, modifiers);
-                case 153 /* GlobalKeyword */:
-                case 138 /* ModuleKeyword */:
-                case 139 /* NamespaceKeyword */:
+                case 154 /* GlobalKeyword */:
+                case 139 /* ModuleKeyword */:
+                case 140 /* NamespaceKeyword */:
                     return parseModuleDeclaration(pos, hasJSDoc, decorators, modifiers);
                 case 99 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers);
@@ -32361,7 +33228,7 @@ var ts;
                     if (decorators || 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(268 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(271 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         ts.setTextRangePos(missing, pos);
                         missing.decorators = decorators;
                         missing.modifiers = modifiers;
@@ -32480,7 +33347,7 @@ var ts;
             // this context.
             // The checker will then give an error that there is an empty declaration list.
             var declarations;
-            if (token() === 155 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 156 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 declarations = createMissingList();
             }
             else {
@@ -32584,12 +33451,12 @@ var ts;
             var parameters = parseParameters(0 /* None */);
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ false);
             var body = parseFunctionBlockOrSemicolon(0 /* None */);
-            var node = kind === 166 /* GetAccessor */
+            var node = kind === 167 /* GetAccessor */
                 ? factory.createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body)
                 : factory.createSetAccessorDeclaration(decorators, modifiers, name, parameters, body);
             // Keep track of `typeParameters` (for both) and `type` (for setters) if they were parsed those indicate grammar errors
             node.typeParameters = typeParameters;
-            if (type && node.kind === 167 /* SetAccessor */)
+            if (type && node.kind === 168 /* SetAccessor */)
                 node.type = type;
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
@@ -32628,7 +33495,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 === 145 /* SetKeyword */ || idToken === 134 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 146 /* SetKeyword */ || idToken === 134 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -32732,10 +33599,10 @@ var ts;
             var decorators = parseDecorators();
             var modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
             if (parseContextualModifier(134 /* GetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 166 /* GetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* GetAccessor */);
             }
-            if (parseContextualModifier(145 /* SetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* SetAccessor */);
+            if (parseContextualModifier(146 /* SetKeyword */)) {
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* SetAccessor */);
             }
             if (token() === 132 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
                 var constructorDeclaration = tryParseConstructorDeclaration(pos, hasJSDoc, decorators, modifiers);
@@ -32774,10 +33641,10 @@ var ts;
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined, 218 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined, 221 /* ClassExpression */);
         }
         function parseClassDeclaration(pos, hasJSDoc, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, 249 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, 252 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, kind) {
             var savedAwaitContext = inAwaitContext();
@@ -32799,7 +33666,7 @@ var ts;
                 members = createMissingList();
             }
             setAwaitContext(savedAwaitContext);
-            var node = kind === 249 /* ClassDeclaration */
+            var node = kind === 252 /* ClassDeclaration */
                 ? factory.createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members)
                 : factory.createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
@@ -32859,11 +33726,11 @@ var ts;
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function parseTypeAliasDeclaration(pos, hasJSDoc, decorators, modifiers) {
-            parseExpected(148 /* TypeKeyword */);
+            parseExpected(149 /* TypeKeyword */);
             var name = parseIdentifier();
             var typeParameters = parseTypeParameters();
             parseExpected(62 /* EqualsToken */);
-            var type = parseType();
+            var type = token() === 136 /* IntrinsicKeyword */ && tryParse(parseKeywordAndNoDot) || parseType();
             parseSemicolon();
             var node = factory.createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
@@ -32919,7 +33786,7 @@ var ts;
         function parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers) {
             var flags = 0;
             var name;
-            if (token() === 153 /* GlobalKeyword */) {
+            if (token() === 154 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 name = parseIdentifier();
                 flags |= 1024 /* GlobalAugmentation */;
@@ -32940,15 +33807,15 @@ var ts;
         }
         function parseModuleDeclaration(pos, hasJSDoc, decorators, modifiers) {
             var flags = 0;
-            if (token() === 153 /* GlobalKeyword */) {
+            if (token() === 154 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers);
             }
-            else if (parseOptional(139 /* NamespaceKeyword */)) {
+            else if (parseOptional(140 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(138 /* ModuleKeyword */);
+                parseExpected(139 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers);
                 }
@@ -32956,7 +33823,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(pos, hasJSDoc, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 142 /* RequireKeyword */ &&
+            return token() === 143 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -32967,7 +33834,7 @@ var ts;
         }
         function parseNamespaceExportDeclaration(pos, hasJSDoc, decorators, modifiers) {
             parseExpected(126 /* AsKeyword */);
-            parseExpected(139 /* NamespaceKeyword */);
+            parseExpected(140 /* NamespaceKeyword */);
             var name = parseIdentifier();
             parseSemicolon();
             var node = factory.createNamespaceExportDeclaration(name);
@@ -32985,7 +33852,7 @@ var ts;
                 identifier = parseIdentifier();
             }
             var isTypeOnly = false;
-            if (token() !== 152 /* FromKeyword */ &&
+            if (token() !== 153 /* FromKeyword */ &&
                 (identifier === null || identifier === void 0 ? void 0 : identifier.escapedText) === "type" &&
                 (isIdentifier() || tokenAfterImportDefinitelyProducesImportDeclaration())) {
                 isTypeOnly = true;
@@ -33003,7 +33870,7 @@ var ts;
                 token() === 18 /* OpenBraceToken */ // import {
             ) {
                 importClause = parseImportClause(identifier, afterImportPos, isTypeOnly);
-                parseExpected(152 /* FromKeyword */);
+                parseExpected(153 /* FromKeyword */);
             }
             var moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
@@ -33016,7 +33883,7 @@ var ts;
         function tokenAfterImportedIdentifierDefinitelyProducesImportDeclaration() {
             // In `import id ___`, the current token decides whether to produce
             // an ImportDeclaration or ImportEqualsDeclaration.
-            return token() === 27 /* CommaToken */ || token() === 152 /* FromKeyword */;
+            return token() === 27 /* CommaToken */ || token() === 153 /* FromKeyword */;
         }
         function parseImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers, identifier, isTypeOnly) {
             parseExpected(62 /* EqualsToken */);
@@ -33041,7 +33908,7 @@ var ts;
             var namedBindings;
             if (!identifier ||
                 parseOptional(27 /* CommaToken */)) {
-                namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(261 /* NamedImports */);
+                namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(264 /* NamedImports */);
             }
             return finishNode(factory.createImportClause(isTypeOnly, identifier, namedBindings), pos);
         }
@@ -33052,7 +33919,7 @@ var ts;
         }
         function parseExternalModuleReference() {
             var pos = getNodePos();
-            parseExpected(142 /* RequireKeyword */);
+            parseExpected(143 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -33089,16 +33956,16 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            var node = kind === 261 /* NamedImports */
+            var node = kind === 264 /* NamedImports */
                 ? factory.createNamedImports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseImportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */))
                 : factory.createNamedExports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */));
             return finishNode(node, pos);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(267 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(270 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(262 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(265 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var pos = getNodePos();
@@ -33125,38 +33992,38 @@ var ts;
             else {
                 name = identifierName;
             }
-            if (kind === 262 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 265 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
-            var node = kind === 262 /* ImportSpecifier */
+            var node = kind === 265 /* ImportSpecifier */
                 ? factory.createImportSpecifier(propertyName, name)
                 : factory.createExportSpecifier(propertyName, name);
             return finishNode(node, pos);
         }
         function parseNamespaceExport(pos) {
-            return finishNode(factory.createNamespaceExport(parseIdentifier()), pos);
+            return finishNode(factory.createNamespaceExport(parseIdentifierName()), pos);
         }
         function parseExportDeclaration(pos, hasJSDoc, decorators, modifiers) {
             var savedAwaitContext = inAwaitContext();
             setAwaitContext(/*value*/ true);
             var exportClause;
             var moduleSpecifier;
-            var isTypeOnly = parseOptional(148 /* TypeKeyword */);
+            var isTypeOnly = parseOptional(149 /* TypeKeyword */);
             var namespaceExportPos = getNodePos();
             if (parseOptional(41 /* AsteriskToken */)) {
                 if (parseOptional(126 /* AsKeyword */)) {
                     exportClause = parseNamespaceExport(namespaceExportPos);
                 }
-                parseExpected(152 /* FromKeyword */);
+                parseExpected(153 /* FromKeyword */);
                 moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                exportClause = parseNamedImportsOrExports(265 /* NamedExports */);
+                exportClause = parseNamedImportsOrExports(268 /* 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() === 152 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(152 /* FromKeyword */);
+                if (token() === 153 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(153 /* FromKeyword */);
                     moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -33273,6 +34140,18 @@ var ts;
                 return finishNode(result, pos);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
+            function parseJSDocNameReference() {
+                var pos = getNodePos();
+                var hasBrace = parseOptional(18 /* OpenBraceToken */);
+                var entityName = parseEntityName(/* allowReservedWords*/ false);
+                if (hasBrace) {
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
+                }
+                var result = factory.createJSDocNameReference(entityName);
+                fixupParentReferences(result);
+                return finishNode(result, pos);
+            }
+            JSDocParser.parseJSDocNameReference = parseJSDocNameReference;
             function parseIsolatedJSDocComment(content, start, length) {
                 initializeState("", content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 var jsDoc = doInsideOfContext(4194304 /* JSDoc */, function () { return parseJSDocCommentWorker(start, length); });
@@ -33336,7 +34215,8 @@ var ts;
                     var state = 1 /* SawAsterisk */;
                     var margin;
                     // + 4 for leading '/** '
-                    var indent = start - Math.max(content.lastIndexOf("\n", start), 0) + 4;
+                    // + 1 because the last index of \n is always one index before the first character in the line and coincidentally, if there is no \n before start, it is -1, which is also one index before the first character
+                    var indent = start - (content.lastIndexOf("\n", start) + 1) + 4;
                     function pushComment(text) {
                         if (!margin) {
                             margin = indent;
@@ -33392,7 +34272,7 @@ var ts;
                                     comments.push(whitespace);
                                 }
                                 else if (margin !== undefined && indent + whitespace.length > margin) {
-                                    comments.push(whitespace.slice(margin - indent - 1));
+                                    comments.push(whitespace.slice(margin - indent));
                                 }
                                 indent += whitespace.length;
                                 break;
@@ -33536,6 +34416,9 @@ var ts;
                         case "callback":
                             tag = parseCallbackTag(start, tagName, margin, indentText);
                             break;
+                        case "see":
+                            tag = parseSeeTag(start, tagName, margin, indentText);
+                            break;
                         default:
                             tag = parseUnknownTag(start, tagName, margin, indentText);
                             break;
@@ -33685,9 +34568,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 144 /* ObjectKeyword */:
+                        case 145 /* ObjectKeyword */:
                             return true;
-                        case 177 /* ArrayType */:
+                        case 178 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
@@ -33719,12 +34602,12 @@ var ts;
                         var child = void 0;
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 322 /* JSDocParameterTag */ || child.kind === 328 /* JSDocPropertyTag */) {
+                            if (child.kind === 326 /* JSDocParameterTag */ || child.kind === 333 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            var literal = finishNode(factory.createJSDocTypeLiteral(children, typeExpression.type.kind === 177 /* ArrayType */), pos);
+                            var literal = finishNode(factory.createJSDocTypeLiteral(children, typeExpression.type.kind === 178 /* ArrayType */), pos);
                             return finishNode(factory.createJSDocTypeExpression(literal), pos);
                         }
                     }
@@ -33746,6 +34629,12 @@ var ts;
                     var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, end, indent, indentText) : undefined;
                     return finishNode(factory.createJSDocTypeTag(tagName, typeExpression, comments), start, end);
                 }
+                function parseSeeTag(start, tagName, indent, indentText) {
+                    var nameExpression = parseJSDocNameReference();
+                    var end = getNodePos();
+                    var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, end, indent, indentText) : undefined;
+                    return finishNode(factory.createJSDocSeeTag(tagName, nameExpression, comments), start, end);
+                }
                 function parseAuthorTag(start, tagName, indent, indentText) {
                     var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
                     if (!authorInfoWithEmail) {
@@ -33861,7 +34750,7 @@ var ts;
                         var hasChildren = false;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             hasChildren = true;
-                            if (child.kind === 325 /* JSDocTypeTag */) {
+                            if (child.kind === 329 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                                     var lastError = ts.lastOrUndefined(parseDiagnostics);
@@ -33879,7 +34768,7 @@ var ts;
                             }
                         }
                         if (hasChildren) {
-                            var isArrayType = typeExpression && typeExpression.type.kind === 177 /* ArrayType */;
+                            var isArrayType = typeExpression && typeExpression.type.kind === 178 /* ArrayType */;
                             var jsdocTypeLiteral = factory.createJSDocTypeLiteral(jsDocPropertyTags, isArrayType);
                             typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
                                 childTypeTag.typeExpression :
@@ -33932,7 +34821,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(59 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 323 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 327 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -33967,7 +34856,7 @@ var ts;
                             case 59 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 322 /* JSDocParameterTag */ || child.kind === 328 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 326 /* JSDocParameterTag */ || child.kind === 333 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -34713,6 +35602,8 @@ var ts;
                 }
                 case "jsx":
                 case "jsxfrag":
+                case "jsximportsource":
+                case "jsxruntime":
                     return; // Accessed directly
                 default: ts.Debug.fail("Unhandled pragma kind"); // Can this be made into an assertNever in the future?
             }
@@ -34837,6 +35728,18 @@ var ts;
 (function (ts) {
     /* @internal */
     ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
+    var jsxOptionMap = new ts.Map(ts.getEntries({
+        "preserve": 1 /* Preserve */,
+        "react-native": 3 /* ReactNative */,
+        "react": 2 /* React */,
+        "react-jsx": 4 /* ReactJSX */,
+        "react-jsxdev": 5 /* ReactJSXDev */,
+    }));
+    /* @internal */
+    ts.inverseJsxOptionMap = new ts.Map(ts.arrayFrom(ts.mapIterator(jsxOptionMap.entries(), function (_a) {
+        var key = _a[0], value = _a[1];
+        return ["" + value, key];
+    })));
     // 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
@@ -34858,6 +35761,7 @@ var ts;
         ["dom.iterable", "lib.dom.iterable.d.ts"],
         ["webworker", "lib.webworker.d.ts"],
         ["webworker.importscripts", "lib.webworker.importscripts.d.ts"],
+        ["webworker.iterable", "lib.webworker.iterable.d.ts"],
         ["scripthost", "lib.scripthost.d.ts"],
         // ES2015 Or ESNext By-feature options
         ["es2015.core", "lib.es2015.core.d.ts"],
@@ -34886,6 +35790,7 @@ var ts;
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
+        ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
@@ -34895,7 +35800,8 @@ var ts;
         ["esnext.intl", "lib.esnext.intl.d.ts"],
         ["esnext.bigint", "lib.es2020.bigint.d.ts"],
         ["esnext.string", "lib.esnext.string.d.ts"],
-        ["esnext.promise", "lib.esnext.promise.d.ts"]
+        ["esnext.promise", "lib.esnext.promise.d.ts"],
+        ["esnext.weakref", "lib.esnext.weakref.d.ts"]
     ];
     /**
      * An array of supported "lib" reference file names used to determine the order for inclusion
@@ -35027,6 +35933,15 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Generates_a_CPU_profile
         },
+        {
+            name: "generateTrace",
+            type: "string",
+            isFilePath: true,
+            isCommandLineOnly: true,
+            paramType: ts.Diagnostics.DIRECTORY,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Generates_an_event_trace_and_a_list_of_types
+        },
         {
             name: "incremental",
             shortName: "i",
@@ -35182,12 +36097,10 @@ var ts;
         },
         {
             name: "jsx",
-            type: new ts.Map(ts.getEntries({
-                "preserve": 1 /* Preserve */,
-                "react-native": 3 /* ReactNative */,
-                "react": 2 /* React */
-            })),
+            type: jsxOptionMap,
             affectsSourceFile: true,
+            affectsEmit: true,
+            affectsModuleResolution: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -35430,6 +36343,14 @@ var ts;
             category: ts.Diagnostics.Additional_Checks,
             description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
         },
+        {
+            name: "noUncheckedIndexedAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: false,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Include_undefined_in_index_signature_results
+        },
         // Module Resolution
         {
             name: "moduleResolution",
@@ -35591,6 +36512,15 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compiler_option_is_specified_e_g_Fragment
         },
+        {
+            name: "jsxImportSource",
+            type: "string",
+            affectsSemanticDiagnostics: true,
+            affectsEmit: true,
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Specify_the_module_specifier_to_be_used_to_import_the_jsx_and_jsxs_factory_functions_from_eg_react
+        },
         {
             name: "resolveJsonModule",
             type: "boolean",
@@ -35902,7 +36832,11 @@ var ts;
                 name: "exclude",
                 type: "string"
             }
-        }
+        },
+        {
+            name: "disableFilenameBasedTypeAcquisition",
+            type: "boolean",
+        },
     ];
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
@@ -36257,7 +37191,7 @@ var ts;
      */
     function readJsonConfigFile(fileName, readFile) {
         var textOrDiagnostic = tryReadFile(fileName, readFile);
-        return ts.isString(textOrDiagnostic) ? ts.parseJsonText(fileName, textOrDiagnostic) : { parseDiagnostics: [textOrDiagnostic] };
+        return ts.isString(textOrDiagnostic) ? ts.parseJsonText(fileName, textOrDiagnostic) : { fileName: fileName, parseDiagnostics: [textOrDiagnostic] };
     }
     ts.readJsonConfigFile = readJsonConfigFile;
     /*@internal*/
@@ -36400,7 +37334,7 @@ var ts;
         function convertObjectLiteralExpressionToJson(node, knownOptions, extraKeyDiagnostics, parentOption) {
             var result = returnValue ? {} : undefined;
             var _loop_4 = function (element) {
-                if (element.kind !== 285 /* PropertyAssignment */) {
+                if (element.kind !== 288 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     return "continue";
                 }
@@ -36491,13 +37425,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 40 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -36514,7 +37448,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -36999,6 +37933,7 @@ var ts;
      * It does *not* resolve the included files.
      */
     function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
+        var _a;
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -37008,6 +37943,13 @@ var ts;
         var ownConfig = json ?
             parseOwnConfigOfJson(json, host, basePath, configFileName, errors) :
             parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors);
+        if ((_a = ownConfig.options) === null || _a === void 0 ? void 0 : _a.paths) {
+            // If we end up needing to resolve relative paths from 'paths' relative to
+            // the config file location, we'll need to know where that config file was.
+            // Since 'paths' can be inherited from an extended config in another directory,
+            // we wouldn't know which directory to use unless we store it here.
+            ownConfig.options.pathsBasePath = basePath;
+        }
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
@@ -38307,12 +39249,15 @@ var ts;
     }
     function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state) {
         var _a = state.compilerOptions, baseUrl = _a.baseUrl, paths = _a.paths;
-        if (baseUrl && paths && !ts.pathIsRelative(moduleName)) {
+        if (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);
+                if (baseUrl) {
+                    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);
+            var baseDirectory = ts.getPathsBasePath(state.compilerOptions, state.host); // Always defined when 'paths' is defined
+            return tryLoadModuleUsingPaths(extensions, moduleName, baseDirectory, paths, loader, /*onlyRecordFailures*/ false, state);
         }
     }
     function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, state) {
@@ -38811,6 +39756,7 @@ var ts;
             }
             var resolved = ts.forEach(paths[matchedPatternText], function (subst) {
                 var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
+                // When baseUrl is not specified, the command line parser resolves relative paths to the config file location.
                 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);
@@ -38976,26 +39922,26 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 250 /* InterfaceDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 252 /* EnumDeclaration */:
+            case 255 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 258 /* ImportDeclaration */:
-            case 257 /* ImportEqualsDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 if (!(ts.hasSyntacticModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. Export alias declarations pointing at only uninstantiated modules or things uninstantiated modules contain
-            case 264 /* ExportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 var exportDeclaration = node;
-                if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 265 /* NamedExports */) {
+                if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 268 /* NamedExports */) {
                     var state = 0 /* NonInstantiated */;
                     for (var _i = 0, _a = exportDeclaration.exportClause.elements; _i < _a.length; _i++) {
                         var specifier = _a[_i];
@@ -39011,7 +39957,7 @@ var ts;
                 }
                 break;
             // 5. other uninstantiated module declarations.
-            case 254 /* ModuleBlock */: {
+            case 257 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateCached(n, visited);
@@ -39033,7 +39979,7 @@ var ts;
                 });
                 return state_1;
             }
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return getModuleInstanceState(node, visited);
             case 78 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
@@ -39105,12 +40051,15 @@ var ts;
     }
     var binder = createBinder();
     function bindSourceFile(file, options) {
+        var tracingData = ["bind" /* Bind */, "bindSourceFile", { path: file.path }];
+        ts.tracing.begin.apply(ts.tracing, tracingData);
         ts.performance.mark("beforeBind");
         ts.perfLogger.logStartBindFile("" + file.fileName);
         binder(file, options);
         ts.perfLogger.logStopBindFile();
         ts.performance.mark("afterBind");
         ts.performance.measure("Bind", "beforeBind", "afterBind");
+        ts.tracing.end.apply(ts.tracing, tracingData);
     }
     ts.bindSourceFile = bindSourceFile;
     function createBinder() {
@@ -39142,6 +40091,8 @@ var ts;
         // 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;
+        // If we are binding an assignment pattern, we will bind certain expressions differently.
+        var inAssignmentPattern = false;
         var symbolCount = 0;
         var Symbol;
         var classifiableNames;
@@ -39191,6 +40142,7 @@ var ts;
             currentExceptionTarget = undefined;
             activeLabelList = undefined;
             hasExplicitReturn = false;
+            inAssignmentPattern = false;
             emitFlags = 0 /* None */;
         }
         return bindSourceFile;
@@ -39228,7 +40180,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 === 263 /* ExportAssignment */) {
+            if (node.kind === 266 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -39237,7 +40189,7 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 157 /* ComputedPropertyName */) {
+                if (name.kind === 158 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
@@ -39265,36 +40217,36 @@ var ts;
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 173 /* FunctionType */:
-                case 168 /* CallSignature */:
-                case 309 /* JSDocSignature */:
+                case 174 /* FunctionType */:
+                case 169 /* CallSignature */:
+                case 313 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 174 /* ConstructorType */:
-                case 169 /* ConstructSignature */:
+                case 175 /* ConstructorType */:
+                case 170 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 170 /* IndexSignature */:
+                case 171 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 304 /* JSDocFunctionType */:
+                case 308 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 159 /* Parameter */:
+                case 160 /* 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 === 304 /* 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 === 308 /* 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;
@@ -39394,7 +40346,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 === 263 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 266 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
                                     multipleDefaultExports_1 = true;
@@ -39431,9 +40383,9 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
+            var hasExportModifier = !!(ts.getCombinedModifierFlags(node) & 1 /* Export */) || jsdocTreatAsExported(node);
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 267 /* ExportSpecifier */ || (node.kind === 257 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 270 /* ExportSpecifier */ || (node.kind === 260 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -39457,7 +40409,7 @@ var ts;
                 //       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 & 64 /* ExportContext */)) || ts.isJSDocTypeAlias(node)) {
+                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 64 /* ExportContext */)) {
                     if (!container.locals || (ts.hasSyntacticModifier(node, 512 /* Default */) && !getDeclarationName(node))) {
                         return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); // No local symbol for an unnamed default!
                     }
@@ -39472,6 +40424,28 @@ var ts;
                 }
             }
         }
+        function jsdocTreatAsExported(node) {
+            if (node.parent && ts.isModuleDeclaration(node)) {
+                node = node.parent;
+            }
+            if (!ts.isJSDocTypeAlias(node))
+                return false;
+            // jsdoc typedef handling is a bit of a doozy, but to summarize, treat the typedef as exported if:
+            // 1. It has an explicit name (since by default typedefs are always directly exported, either at the top level or in a container), or
+            if (!ts.isJSDocEnumTag(node) && !!node.fullName)
+                return true;
+            // 2. The thing a nameless typedef pulls its name from is implicitly a direct export (either by assignment or actual export flag).
+            var declName = ts.getNameOfDeclaration(node);
+            if (!declName)
+                return false;
+            if (ts.isPropertyAccessEntityNameExpression(declName.parent) && isTopLevelNamespaceAssignment(declName.parent))
+                return true;
+            if (ts.isDeclaration(declName.parent) && ts.getCombinedModifierFlags(declName.parent) & 1 /* Export */)
+                return true;
+            // This could potentially be simplified by having `delayedBindJSDocTypedefTag` pass in an override for `hasExportModifier`, since it should
+            // already have calculated and branched on most of this.
+            return false;
+        }
         // 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.
@@ -39500,7 +40474,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 !== 206 /* ArrowFunction */) {
+                if (node.kind !== 209 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -39533,7 +40507,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 === 165 /* Constructor */ || (ts.isInJSFile && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */)) ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 166 /* Constructor */ || (ts.isInJSFile && (node.kind === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */)) ? createBranchLabel() : undefined;
                 currentExceptionTarget = undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
@@ -39548,13 +40522,13 @@ var ts;
                         node.flags |= 512 /* HasExplicitReturn */;
                     node.endFlowNode = currentFlow;
                 }
-                if (node.kind === 294 /* SourceFile */) {
+                if (node.kind === 297 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 165 /* Constructor */ || (ts.isInJSFile && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */))) {
+                    if (node.kind === 166 /* Constructor */ || (ts.isInJSFile && (node.kind === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */))) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -39581,8 +40555,8 @@ var ts;
             blockScopeContainer = savedBlockScopeContainer;
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 248 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 248 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 251 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 251 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -39595,129 +40569,156 @@ var ts;
             ts.forEachChild(node, bind, bindEach);
         }
         function bindChildren(node) {
+            var saveInAssignmentPattern = inAssignmentPattern;
+            // Most nodes aren't valid in an assignment pattern, so we clear the value here
+            // and set it before we descend into nodes that could actually be part of an assignment pattern.
+            inAssignmentPattern = false;
             if (checkUnreachable(node)) {
                 bindEachChild(node);
                 bindJSDoc(node);
+                inAssignmentPattern = saveInAssignmentPattern;
                 return;
             }
-            if (node.kind >= 229 /* FirstStatement */ && node.kind <= 245 /* LastStatement */ && !options.allowUnreachableCode) {
+            if (node.kind >= 232 /* FirstStatement */ && node.kind <= 248 /* LastStatement */ && !options.allowUnreachableCode) {
                 node.flowNode = currentFlow;
             }
             switch (node.kind) {
-                case 233 /* WhileStatement */:
+                case 236 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 232 /* DoStatement */:
+                case 235 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 231 /* IfStatement */:
+                case 234 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 239 /* ReturnStatement */:
-                case 243 /* ThrowStatement */:
+                case 242 /* ReturnStatement */:
+                case 246 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 238 /* BreakStatement */:
-                case 237 /* ContinueStatement */:
+                case 241 /* BreakStatement */:
+                case 240 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 244 /* TryStatement */:
+                case 247 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 255 /* CaseBlock */:
+                case 258 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 281 /* CaseClause */:
+                case 284 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     bindExpressionStatement(node);
                     break;
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 212 /* PostfixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
+                    if (ts.isDestructuringAssignment(node)) {
+                        // Carry over whether we are in an assignment pattern to
+                        // binary expressions that could actually be an initializer
+                        inAssignmentPattern = saveInAssignmentPattern;
+                        bindDestructuringAssignmentFlow(node);
+                        return;
+                    }
                     bindBinaryExpressionFlow(node);
                     break;
-                case 207 /* DeleteExpression */:
+                case 210 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     bindAccessExpressionFlow(node);
                     break;
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 222 /* NonNullExpression */:
+                case 225 /* NonNullExpression */:
                     bindNonNullExpressionFlow(node);
                     break;
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 321 /* JSDocEnumTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 325 /* JSDocEnumTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 294 /* SourceFile */: {
+                case 297 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 227 /* Block */:
-                case 254 /* ModuleBlock */:
+                case 230 /* Block */:
+                case 257 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
+                case 198 /* BindingElement */:
+                    bindBindingElementFlow(node);
+                    break;
+                case 200 /* ObjectLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
+                case 288 /* PropertyAssignment */:
+                case 220 /* SpreadElement */:
+                    // Carry over whether we are in an assignment pattern of Object and Array literals
+                    // as well as their children that are valid assignment targets.
+                    inAssignmentPattern = saveInAssignmentPattern;
+                // falls through
                 default:
                     bindEachChild(node);
                     break;
             }
             bindJSDoc(node);
+            inAssignmentPattern = saveInAssignmentPattern;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
                 case 78 /* Identifier */:
+                case 79 /* PrivateIdentifier */:
                 case 107 /* ThisKeyword */:
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return containsNarrowableReference(expr);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
+                case 225 /* NonNullExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return expr.operator === 53 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 208 /* TypeOfExpression */:
+                case 211 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 78 /* Identifier */ || expr.kind === 107 /* ThisKeyword */ || expr.kind === 105 /* SuperKeyword */ ||
+            return expr.kind === 78 /* Identifier */ || expr.kind === 79 /* PrivateIdentifier */ || expr.kind === 107 /* ThisKeyword */ || expr.kind === 105 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
+                ts.isBinaryExpression(expr) && expr.operatorToken.kind === 27 /* CommaToken */ && isNarrowableReference(expr.right) ||
                 ts.isElementAccessExpression(expr) && ts.isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression) ||
                 ts.isAssignmentExpression(expr) && isNarrowableReference(expr.left);
         }
@@ -39733,7 +40734,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 198 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 201 /* PropertyAccessExpression */ &&
                 containsNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -39769,9 +40770,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
@@ -39847,26 +40848,26 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 231 /* IfStatement */:
-                case 233 /* WhileStatement */:
-                case 232 /* DoStatement */:
+                case 234 /* IfStatement */:
+                case 236 /* WhileStatement */:
+                case 235 /* DoStatement */:
                     return parent.expression === node;
-                case 234 /* ForStatement */:
-                case 214 /* ConditionalExpression */:
+                case 237 /* ForStatement */:
+                case 217 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 204 /* ParenthesizedExpression */) {
+                if (node.kind === 207 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 211 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) {
+                else if (node.kind === 214 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 213 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 216 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 56 /* BarBarToken */ ||
                         node.operatorToken.kind === 60 /* QuestionQuestionToken */);
                 }
@@ -39913,7 +40914,7 @@ var ts;
         }
         function setContinueTarget(node, target) {
             var label = activeLabelList;
-            while (label && node.parent.kind === 242 /* LabeledStatement */) {
+            while (label && node.parent.kind === 245 /* LabeledStatement */) {
                 label.continueTarget = target;
                 label = label.next;
                 node = node.parent;
@@ -39964,12 +40965,12 @@ var ts;
             bind(node.expression);
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 236 /* ForOfStatement */) {
+            if (node.kind === 239 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 247 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 250 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -39991,7 +40992,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 239 /* ReturnStatement */) {
+            if (node.kind === 242 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -40008,7 +41009,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 238 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 241 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -40113,7 +41114,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 282 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 285 /* 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). Note, we no longer need
             // this property in control flow analysis, it's there only for backwards compatibility.
@@ -40156,10 +41157,13 @@ var ts;
         }
         function bindExpressionStatement(node) {
             bind(node.expression);
-            // A top level call expression with a dotted function name and at least one argument
+            maybeBindExpressionFlowIfCall(node.expression);
+        }
+        function maybeBindExpressionFlowIfCall(node) {
+            // A top level or LHS of comma expression call expression with a dotted function name and at least one argument
             // is potentially an assertion and is therefore included in the control flow.
-            if (node.expression.kind === 200 /* CallExpression */) {
-                var call = node.expression;
+            if (node.kind === 203 /* CallExpression */) {
+                var call = node;
                 if (ts.isDottedName(call.expression) && call.expression.kind !== 105 /* SuperKeyword */) {
                     currentFlow = createFlowCall(currentFlow, call);
                 }
@@ -40184,7 +41188,7 @@ var ts;
             currentFlow = finishFlowLabel(postStatementLabel);
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) {
+            if (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -40195,10 +41199,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowMutation(16 /* Assignment */, currentFlow, node);
             }
-            else if (node.kind === 196 /* ArrayLiteralExpression */) {
+            else if (node.kind === 199 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 217 /* SpreadElement */) {
+                    if (e.kind === 220 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -40206,16 +41210,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 197 /* ObjectLiteralExpression */) {
+            else if (node.kind === 200 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 285 /* PropertyAssignment */) {
+                    if (p.kind === 288 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 286 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 289 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 287 /* SpreadAssignment */) {
+                    else if (p.kind === 290 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -40263,6 +41267,23 @@ var ts;
                 bindAssignmentTargetFlow(node.operand);
             }
         }
+        function bindDestructuringAssignmentFlow(node) {
+            if (inAssignmentPattern) {
+                inAssignmentPattern = false;
+                bind(node.operatorToken);
+                bind(node.right);
+                inAssignmentPattern = true;
+                bind(node.left);
+            }
+            else {
+                inAssignmentPattern = true;
+                bind(node.left);
+                inAssignmentPattern = false;
+                bind(node.operatorToken);
+                bind(node.right);
+            }
+            bindAssignmentTargetFlow(node.left);
+        }
         var BindBinaryExpressionFlowState;
         (function (BindBinaryExpressionFlowState) {
             BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["BindThenBindChildren"] = 0] = "BindThenBindChildren";
@@ -40317,6 +41338,9 @@ var ts;
                         break;
                     }
                     case 2 /* BindToken */: {
+                        if (node.operatorToken.kind === 27 /* CommaToken */) {
+                            maybeBindExpressionFlowIfCall(node.left);
+                        }
                         advanceState(3 /* BindRight */);
                         maybeBind(node.operatorToken);
                         break;
@@ -40330,7 +41354,7 @@ var ts;
                         var operator = node.operatorToken.kind;
                         if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                             bindAssignmentTargetFlow(node.left);
-                            if (operator === 62 /* EqualsToken */ && node.left.kind === 199 /* ElementAccessExpression */) {
+                            if (operator === 62 /* EqualsToken */ && node.left.kind === 202 /* ElementAccessExpression */) {
                                 var elementAccess = node.left;
                                 if (isNarrowableOperand(elementAccess.expression)) {
                                     currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node);
@@ -40367,7 +41391,7 @@ var ts;
              * If `node` is a BinaryExpression, adds it to the local work stack, otherwise recursively binds it
              */
             function maybeBind(node) {
-                if (node && ts.isBinaryExpression(node)) {
+                if (node && ts.isBinaryExpression(node) && !ts.isDestructuringAssignment(node)) {
                     stackIndex++;
                     workStacks.expr[stackIndex] = node;
                     workStacks.state[stackIndex] = 0 /* BindThenBindChildren */;
@@ -40381,7 +41405,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 198 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 201 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -40418,9 +41442,27 @@ var ts;
                 bindInitializedVariableFlow(node);
             }
         }
+        function bindBindingElementFlow(node) {
+            if (ts.isBindingPattern(node.name)) {
+                // When evaluating a binding pattern, the initializer is evaluated before the binding pattern, per:
+                // - https://tc39.es/ecma262/#sec-destructuring-binding-patterns-runtime-semantics-iteratorbindinginitialization
+                //   - `BindingElement: BindingPattern Initializer?`
+                // - https://tc39.es/ecma262/#sec-runtime-semantics-keyedbindinginitialization
+                //   - `BindingElement: BindingPattern Initializer?`
+                bindEach(node.decorators);
+                bindEach(node.modifiers);
+                bind(node.dotDotDotToken);
+                bind(node.propertyName);
+                bind(node.initializer);
+                bind(node.name);
+            }
+            else {
+                bindEachChild(node);
+            }
+        }
         function bindJSDocTypeAlias(node) {
             ts.setParent(node.tagName, node);
-            if (node.kind !== 321 /* JSDocEnumTag */ && node.fullName) {
+            if (node.kind !== 325 /* JSDocEnumTag */ && node.fullName) {
                 ts.setParent(node.fullName, node);
                 ts.setParentRecursive(node.fullName, /*incremental*/ false);
             }
@@ -40428,7 +41470,7 @@ var ts;
         function bindJSDocClassTag(node) {
             bindEachChild(node);
             var host = ts.getHostSignatureFromJSDoc(node);
-            if (host && host.kind !== 164 /* MethodDeclaration */) {
+            if (host && host.kind !== 165 /* MethodDeclaration */) {
                 addDeclarationToSymbol(host.symbol, host, 32 /* Class */);
             }
         }
@@ -40441,15 +41483,15 @@ var ts;
         }
         function bindOptionalChainRest(node) {
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     bind(node.questionDotToken);
                     bind(node.name);
                     break;
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     bind(node.questionDotToken);
                     bind(node.argumentExpression);
                     break;
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     bind(node.questionDotToken);
                     bindEach(node.typeArguments);
                     bindEach(node.arguments);
@@ -40514,7 +41556,7 @@ 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 = ts.skipParentheses(node.expression);
-                if (expr.kind === 205 /* FunctionExpression */ || expr.kind === 206 /* ArrowFunction */) {
+                if (expr.kind === 208 /* FunctionExpression */ || expr.kind === 209 /* ArrowFunction */) {
                     bindEach(node.typeArguments);
                     bindEach(node.arguments);
                     bind(node.expression);
@@ -40526,7 +41568,7 @@ var ts;
                     }
                 }
             }
-            if (node.expression.kind === 198 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 201 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (ts.isIdentifier(propertyAccess.name) && isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node);
@@ -40535,54 +41577,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 218 /* ClassExpression */:
-                case 249 /* ClassDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 197 /* ObjectLiteralExpression */:
-                case 176 /* TypeLiteral */:
-                case 308 /* JSDocTypeLiteral */:
-                case 278 /* JsxAttributes */:
+                case 221 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 200 /* ObjectLiteralExpression */:
+                case 177 /* TypeLiteral */:
+                case 312 /* JSDocTypeLiteral */:
+                case 281 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 253 /* ModuleDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 189 /* MappedType */:
+                case 256 /* ModuleDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 190 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 165 /* Constructor */:
-                case 248 /* FunctionDeclaration */:
-                case 163 /* MethodSignature */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 168 /* CallSignature */:
-                case 309 /* JSDocSignature */:
-                case 304 /* JSDocFunctionType */:
-                case 173 /* FunctionType */:
-                case 169 /* ConstructSignature */:
-                case 170 /* IndexSignature */:
-                case 174 /* ConstructorType */:
+                case 166 /* Constructor */:
+                case 251 /* FunctionDeclaration */:
+                case 164 /* MethodSignature */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 169 /* CallSignature */:
+                case 313 /* JSDocSignature */:
+                case 308 /* JSDocFunctionType */:
+                case 174 /* FunctionType */:
+                case 170 /* ConstructSignature */:
+                case 171 /* IndexSignature */:
+                case 175 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 254 /* ModuleBlock */:
+                case 257 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 284 /* CatchClause */:
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
-                case 255 /* CaseBlock */:
+                case 287 /* CatchClause */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
+                case 258 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 227 /* Block */:
+                case 230 /* 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
@@ -40615,45 +41657,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 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 218 /* ClassExpression */:
-                case 249 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 176 /* TypeLiteral */:
-                case 308 /* JSDocTypeLiteral */:
-                case 197 /* ObjectLiteralExpression */:
-                case 250 /* InterfaceDeclaration */:
-                case 278 /* JsxAttributes */:
+                case 177 /* TypeLiteral */:
+                case 312 /* JSDocTypeLiteral */:
+                case 200 /* ObjectLiteralExpression */:
+                case 253 /* InterfaceDeclaration */:
+                case 281 /* 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 173 /* FunctionType */:
-                case 174 /* ConstructorType */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 309 /* JSDocSignature */:
-                case 170 /* IndexSignature */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 165 /* Constructor */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 304 /* JSDocFunctionType */:
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 251 /* TypeAliasDeclaration */:
-                case 189 /* MappedType */:
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 313 /* JSDocSignature */:
+                case 171 /* IndexSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 166 /* Constructor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 308 /* JSDocFunctionType */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 254 /* TypeAliasDeclaration */:
+                case 190 /* 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
@@ -40754,7 +41796,7 @@ var ts;
                 var seen = new ts.Map();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 287 /* SpreadAssignment */ || prop.name.kind !== 78 /* Identifier */) {
+                    if (prop.kind === 290 /* SpreadAssignment */ || prop.name.kind !== 78 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -40766,7 +41808,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 === 285 /* PropertyAssignment */ || prop.kind === 286 /* ShorthandPropertyAssignment */ || prop.kind === 164 /* MethodDeclaration */
+                    var currentKind = prop.kind === 288 /* PropertyAssignment */ || prop.kind === 289 /* ShorthandPropertyAssignment */ || prop.kind === 165 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -40798,10 +41840,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -41000,8 +42042,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 294 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 253 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 297 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 256 /* 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.
@@ -41096,7 +42138,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 > 155 /* LastToken */) {
+            if (node.kind > 156 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -41172,7 +42214,7 @@ var ts;
                     }
                 // falls through
                 case 107 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 286 /* ShorthandPropertyAssignment */)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 289 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkContextualIdentifier(node);
@@ -41181,8 +42223,8 @@ var ts;
                     break;
                 case 79 /* PrivateIdentifier */:
                     return checkPrivateIdentifier(node);
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     var expr = node;
                     if (currentFlow && isNarrowableReference(expr)) {
                         expr.flowNode = currentFlow;
@@ -41193,11 +42235,11 @@ var ts;
                     if (ts.isInJSFile(expr) &&
                         file.commonJsModuleIndicator &&
                         ts.isModuleExportsAccessExpression(expr) &&
-                        !lookupSymbolForNameWorker(blockScopeContainer, "module")) {
+                        !lookupSymbolForName(blockScopeContainer, "module")) {
                         declareSymbol(file.locals, /*parent*/ undefined, expr.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 111550 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -41216,6 +42258,14 @@ var ts;
                             bindThisPropertyAssignment(node);
                             break;
                         case 5 /* Property */:
+                            var expression = node.left.expression;
+                            if (ts.isInJSFile(node) && ts.isIdentifier(expression)) {
+                                var symbol = lookupSymbolForName(blockScopeContainer, expression.escapedText);
+                                if (ts.isThisInitializedDeclaration(symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration)) {
+                                    bindThisPropertyAssignment(node);
+                                    break;
+                                }
+                            }
                             bindSpecialPropertyAssignment(node);
                             break;
                         case 0 /* None */:
@@ -41225,78 +42275,78 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 207 /* DeleteExpression */:
+                case 210 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 212 /* PostfixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 240 /* WithStatement */:
+                case 243 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 186 /* ThisType */:
+                case 187 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 171 /* TypePredicate */:
+                case 172 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 158 /* TypeParameter */:
+                case 159 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return bindParameter(node);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 285 /* PropertyAssignment */:
-                case 286 /* ShorthandPropertyAssignment */:
+                case 288 /* PropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 288 /* EnumMember */:
+                case 291 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 900095 /* EnumMemberExcludes */);
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 170 /* IndexSignature */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 171 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* 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 */ : 103359 /* MethodExcludes */);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 166 /* GetAccessor */:
+                case 167 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 46015 /* GetAccessorExcludes */);
-                case 167 /* SetAccessor */:
+                case 168 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 78783 /* SetAccessorExcludes */);
-                case 173 /* FunctionType */:
-                case 304 /* JSDocFunctionType */:
-                case 309 /* JSDocSignature */:
-                case 174 /* ConstructorType */:
+                case 174 /* FunctionType */:
+                case 308 /* JSDocFunctionType */:
+                case 313 /* JSDocSignature */:
+                case 175 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 176 /* TypeLiteral */:
-                case 308 /* JSDocTypeLiteral */:
-                case 189 /* MappedType */:
+                case 177 /* TypeLiteral */:
+                case 312 /* JSDocTypeLiteral */:
+                case 190 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 315 /* JSDocClassTag */:
+                case 319 /* JSDocClassTag */:
                     return bindJSDocClassTag(node);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -41315,65 +42365,65 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 218 /* ClassExpression */:
-                case 249 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 788872 /* InterfaceExcludes */);
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 788968 /* TypeAliasExcludes */);
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 278 /* JsxAttributes */:
+                case 281 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 277 /* JsxAttribute */:
+                case 280 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 257 /* ImportEqualsDeclaration */:
-                case 260 /* NamespaceImport */:
-                case 262 /* ImportSpecifier */:
-                case 267 /* ExportSpecifier */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 263 /* NamespaceImport */:
+                case 265 /* ImportSpecifier */:
+                case 270 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 256 /* NamespaceExportDeclaration */:
+                case 259 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     return bindImportClause(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 227 /* Block */:
+                case 230 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 254 /* ModuleBlock */:
+                case 257 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 322 /* JSDocParameterTag */:
-                    if (node.parent.kind === 309 /* JSDocSignature */) {
+                case 326 /* JSDocParameterTag */:
+                    if (node.parent.kind === 313 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 308 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 312 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 328 /* JSDocPropertyTag */:
+                case 333 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 303 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 307 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 321 /* JSDocEnumTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 325 /* JSDocEnumTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -41494,9 +42544,9 @@ var ts;
                 return symbol;
             });
             if (symbol) {
-                var flags = ts.isClassExpression(node.right) ?
-                    4 /* Property */ | 1048576 /* ExportValue */ | 32 /* Class */ :
-                    4 /* Property */ | 1048576 /* ExportValue */;
+                var isAlias = ts.isAliasableExpression(node.right) && (ts.isExportsIdentifier(node.left.expression) || ts.isModuleExportsAccessExpression(node.left.expression));
+                var flags = isAlias ? 2097152 /* Alias */ : 4 /* Property */ | 1048576 /* ExportValue */;
+                ts.setParent(node.left, node);
                 declareSymbol(symbol.exports, symbol, node.left, flags, 0 /* None */);
             }
         }
@@ -41512,6 +42562,10 @@ var ts;
             if (ts.isEmptyObjectLiteral(assignedExpression) || container === file && isExportsOrModuleExportsOrAlias(file, assignedExpression)) {
                 return;
             }
+            if (ts.isObjectLiteralExpression(assignedExpression) && ts.every(assignedExpression.properties, ts.isShorthandPropertyAssignment)) {
+                ts.forEach(assignedExpression.properties, bindExportAssignedObjectMemberAlias);
+                return;
+            }
             // 'module.exports = expr' assignment
             var flags = ts.exportAssignmentIsAlias(node)
                 ? 2097152 /* Alias */
@@ -41519,6 +42573,9 @@ var ts;
             var symbol = declareSymbol(file.symbol.exports, file.symbol, node, flags | 67108864 /* Assignment */, 0 /* None */);
             ts.setValueDeclaration(symbol, node);
         }
+        function bindExportAssignedObjectMemberAlias(node) {
+            declareSymbol(file.symbol.exports, file.symbol, node, 2097152 /* Alias */ | 67108864 /* Assignment */, 0 /* None */);
+        }
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJSFile(node));
             // private identifiers *must* be declared (even in JS files)
@@ -41529,8 +42586,8 @@ var ts;
             }
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* 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 === 62 /* EqualsToken */) {
@@ -41552,11 +42609,11 @@ var ts;
                         addDeclarationToSymbol(constructorSymbol, constructorSymbol.valueDeclaration, 32 /* Class */);
                     }
                     break;
-                case 165 /* Constructor */:
-                case 162 /* PropertyDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 166 /* Constructor */:
+                case 163 /* PropertyDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
@@ -41568,7 +42625,7 @@ var ts;
                         declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */ | 67108864 /* Assignment */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     }
                     break;
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (ts.hasDynamicName(node)) {
                         break;
@@ -41597,7 +42654,7 @@ var ts;
             if (node.expression.kind === 107 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 294 /* SourceFile */) {
+            else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 297 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -41637,16 +42694,21 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 294 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 297 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false, /*containerIsClass*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
         function bindSpecialPropertyAssignment(node) {
+            var _a;
             // Class declarations in Typescript do not allow property declarations
             var parentSymbol = lookupSymbolForPropertyAccess(node.left.expression, container) || lookupSymbolForPropertyAccess(node.left.expression, blockScopeContainer);
             if (!ts.isInJSFile(node) && !ts.isFunctionSymbol(parentSymbol)) {
                 return;
             }
+            var rootExpr = ts.getLeftmostAccessExpression(node.left);
+            if (ts.isIdentifier(rootExpr) && ((_a = lookupSymbolForName(container, rootExpr.escapedText)) === null || _a === void 0 ? void 0 : _a.flags) & 2097152 /* Alias */) {
+                return;
+            }
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             ts.setParent(node.left, node);
             ts.setParent(node.right, node);
@@ -41680,17 +42742,17 @@ var ts;
             }
             if (isToplevel && !isPrototypeProperty) {
                 // make symbols or add declarations for intermediate containers
-                var flags_1 = 1536 /* Module */ | 67108864 /* Assignment */;
+                var flags_2 = 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);
+                        addDeclarationToSymbol(symbol, id, flags_2);
                         return symbol;
                     }
                     else {
                         var table = parent ? parent.exports :
                             file.jsGlobalAugmentations || (file.jsGlobalAugmentations = ts.createSymbolTable());
-                        return declareSymbol(table, parent, id, flags_1, excludeFlags_1);
+                        return declareSymbol(table, parent, id, flags_2, excludeFlags_1);
                     }
                 });
             }
@@ -41741,8 +42803,8 @@ var ts;
         }
         function isTopLevelNamespaceAssignment(propertyAccess) {
             return ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 294 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 294 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 297 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 297 /* SourceFile */;
         }
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty, containerIsClass) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name, container) || lookupSymbolForPropertyAccess(name, blockScopeContainer);
@@ -41789,7 +42851,7 @@ var ts;
         function lookupSymbolForPropertyAccess(node, lookupContainer) {
             if (lookupContainer === void 0) { lookupContainer = container; }
             if (ts.isIdentifier(node)) {
-                return lookupSymbolForNameWorker(lookupContainer, node.escapedText);
+                return lookupSymbolForName(lookupContainer, node.escapedText);
             }
             else {
                 var symbol = lookupSymbolForPropertyAccess(node.expression);
@@ -41821,7 +42883,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 249 /* ClassDeclaration */) {
+            if (node.kind === 252 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899503 /* ClassExcludes */);
             }
             else {
@@ -41863,7 +42925,10 @@ var ts;
                 checkStrictModeEvalOrArguments(node, node.name);
             }
             if (!ts.isBindingPattern(node.name)) {
-                if (ts.isBlockOrCatchScoped(node)) {
+                if (ts.isInJSFile(node) && ts.isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true) && !ts.getJSDocTypeTag(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
+                }
+                else if (ts.isBlockOrCatchScoped(node)) {
                     bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
                 }
                 else if (ts.isParameterDeclaration(node)) {
@@ -41884,7 +42949,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 322 /* JSDocParameterTag */ && container.kind !== 309 /* JSDocSignature */) {
+            if (node.kind === 326 /* JSDocParameterTag */ && container.kind !== 313 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 8388608 /* Ambient */)) {
@@ -41961,7 +43026,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 526824 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 184 /* InferType */) {
+            else if (node.parent.kind === 185 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -41989,11 +43054,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 228 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 231 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 249 /* ClassDeclaration */ ||
+                    node.kind === 252 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 253 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 256 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -42037,12 +43102,12 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 250 /* InterfaceDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
                 return true;
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 252 /* EnumDeclaration */:
+            case 255 /* EnumDeclaration */:
                 return ts.hasSyntacticModifier(s, 2048 /* Const */);
             default:
                 return false;
@@ -42058,7 +43123,7 @@ var ts;
                 return true;
             }
             else if (ts.isIdentifier(node)) {
-                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                var symbol = lookupSymbolForName(sourceFile, node.escapedText);
                 if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
                     var init = symbol.valueDeclaration.initializer;
                     q.push(init);
@@ -42072,7 +43137,7 @@ var ts;
         return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function lookupSymbolForNameWorker(container, name) {
+    function lookupSymbolForName(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
             return local.exportSymbol || local;
@@ -42242,7 +43307,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 === 175 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 176 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -42272,6 +43337,7 @@ var ts;
         IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
         IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
         IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        IterationUse[IterationUse["PossiblyOutOfBounds"] = 128] = "PossiblyOutOfBounds";
         // Spread, Destructuring, Array element assignment
         IterationUse[IterationUse["Element"] = 1] = "Element";
         IterationUse[IterationUse["Spread"] = 33] = "Spread";
@@ -42418,6 +43484,7 @@ var ts;
         AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
         AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
         AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        AccessFlags[AccessFlags["ExpressionPosition"] = 16] = "ExpressionPosition";
     })(AccessFlags || (AccessFlags = {}));
     var SignatureCheckMode;
     (function (SignatureCheckMode) {
@@ -42476,6 +43543,25 @@ var ts;
         DeclarationSpaces[DeclarationSpaces["ExportType"] = 2] = "ExportType";
         DeclarationSpaces[DeclarationSpaces["ExportNamespace"] = 4] = "ExportNamespace";
     })(DeclarationSpaces || (DeclarationSpaces = {}));
+    var MinArgumentCountFlags;
+    (function (MinArgumentCountFlags) {
+        MinArgumentCountFlags[MinArgumentCountFlags["None"] = 0] = "None";
+        MinArgumentCountFlags[MinArgumentCountFlags["StrongArityForUntypedJS"] = 1] = "StrongArityForUntypedJS";
+        MinArgumentCountFlags[MinArgumentCountFlags["VoidIsNonOptional"] = 2] = "VoidIsNonOptional";
+    })(MinArgumentCountFlags || (MinArgumentCountFlags = {}));
+    var IntrinsicTypeKind;
+    (function (IntrinsicTypeKind) {
+        IntrinsicTypeKind[IntrinsicTypeKind["Uppercase"] = 0] = "Uppercase";
+        IntrinsicTypeKind[IntrinsicTypeKind["Lowercase"] = 1] = "Lowercase";
+        IntrinsicTypeKind[IntrinsicTypeKind["Capitalize"] = 2] = "Capitalize";
+        IntrinsicTypeKind[IntrinsicTypeKind["Uncapitalize"] = 3] = "Uncapitalize";
+    })(IntrinsicTypeKind || (IntrinsicTypeKind = {}));
+    var intrinsicTypeKinds = new ts.Map(ts.getEntries({
+        Uppercase: 0 /* Uppercase */,
+        Lowercase: 1 /* Lowercase */,
+        Capitalize: 2 /* Capitalize */,
+        Uncapitalize: 3 /* Uncapitalize */
+    }));
     function SymbolLinks() {
     }
     function NodeLinks() {
@@ -42539,6 +43625,7 @@ var ts;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
+        var typeCatalog = []; // NB: id is index + 1
         var emptySymbols = ts.createSymbolTable();
         var arrayVariances = [1 /* Covariant */];
         var compilerOptions = host.getCompilerOptions();
@@ -42575,6 +43662,7 @@ var ts;
             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; },
+            getTypeCatalog: function () { return typeCatalog; },
             getTypeCount: function () { return typeCount; },
             getInstantiationCount: function () { return totalInstantiationCount; },
             getRelationCacheSizes: function () { return ({
@@ -42589,6 +43677,7 @@ var ts;
             getMergedSymbol: getMergedSymbol,
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
+            getRecursionIdentity: getRecursionIdentity,
             getTypeOfSymbolAtLocation: function (symbol, locationIn) {
                 var location = ts.getParseTreeNode(locationIn);
                 return location ? getTypeOfSymbolAtLocation(symbol, location) : errorType;
@@ -42697,6 +43786,7 @@ var ts;
             },
             getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
             getRootSymbols: getRootSymbols,
+            getSymbolOfExpando: getSymbolOfExpando,
             getContextualType: function (nodeIn, contextFlags) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isExpression);
                 if (!node) {
@@ -42890,6 +43980,8 @@ var ts;
         var intersectionTypes = new ts.Map();
         var literalTypes = new ts.Map();
         var indexedAccessTypes = new ts.Map();
+        var templateLiteralTypes = new ts.Map();
+        var stringMappingTypes = new ts.Map();
         var substitutionTypes = new ts.Map();
         var evolvingArrayTypes = [];
         var undefinedProperties = new ts.Map();
@@ -42900,6 +43992,7 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var nonInferrableAnyType = createIntrinsicType(1 /* Any */, "any", 524288 /* ContainsWideningType */);
+        var intrinsicMarkerType = createIntrinsicType(1 /* Any */, "intrinsic");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
         var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
         var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 524288 /* ContainsWideningType */);
@@ -42938,6 +44031,7 @@ var ts;
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
         var keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
         var numberOrBigIntType = getUnionType([numberType, bigintType]);
+        var templateConstraintType = getUnionType([stringType, numberType, booleanType, bigintType, nullType, undefinedType]);
         var restrictiveMapper = makeFunctionTypeMapper(function (t) { return t.flags & 262144 /* TypeParameter */ ? getRestrictiveTypeParameter(t) : t; });
         var permissiveMapper = makeFunctionTypeMapper(function (t) { return t.flags & 262144 /* TypeParameter */ ? wildcardType : t; });
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -43209,6 +44303,16 @@ var ts;
             }
         }
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
+            // Pseudo-synthesized input node
+            if (location.pos < 0 || location.end < 0) {
+                if (!isError) {
+                    return; // Drop suggestions (we have no span to suggest on)
+                }
+                // Issue errors globally
+                var file = ts.getSourceFileOfNode(location);
+                addErrorOrSuggestion(isError, "message" in message ? ts.createFileDiagnostic(file, 0, 0, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForFileFromMessageChain(file, message)); // eslint-disable-line no-in-operator
+                return;
+            }
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message)); // eslint-disable-line no-in-operator
         }
         function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
@@ -43498,7 +44602,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = new NodeLinks());
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 294 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 297 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -43557,17 +44661,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos && !(ts.isPropertyDeclaration(declaration) && ts.isThisProperty(usage.parent) && !declaration.initializer && !declaration.exclamationToken)) {
                 // declaration is before usage
-                if (declaration.kind === 195 /* BindingElement */) {
+                if (declaration.kind === 198 /* 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, 195 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 198 /* 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, 246 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 249 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 246 /* VariableDeclaration */) {
+                else if (declaration.kind === 249 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -43597,12 +44701,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 === 267 /* ExportSpecifier */ || (usage.parent.kind === 263 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 270 /* ExportSpecifier */ || (usage.parent.kind === 266 /* 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 === 263 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 266 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             if (!!(usage.flags & 4194304 /* JSDoc */) || isInTypeQuery(usage) || usageInTypeDeclaration()) {
@@ -43624,9 +44728,9 @@ var ts;
             }
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 switch (declaration.parent.parent.kind) {
-                    case 229 /* VariableStatement */:
-                    case 234 /* ForStatement */:
-                    case 236 /* ForOfStatement */:
+                    case 232 /* VariableStatement */:
+                    case 237 /* ForStatement */:
+                    case 239 /* 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, declContainer)) {
@@ -43647,16 +44751,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 162 /* PropertyDeclaration */ &&
+                        current.parent.kind === 163 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasSyntacticModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 164 /* MethodDeclaration */) {
+                            if (declaration.kind === 165 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 162 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 163 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -43678,19 +44782,19 @@ var ts;
                         return "quit";
                     }
                     switch (node.kind) {
-                        case 206 /* ArrowFunction */:
+                        case 209 /* ArrowFunction */:
                             return true;
-                        case 162 /* PropertyDeclaration */:
+                        case 163 /* PropertyDeclaration */:
                             // even when stopping at any property declaration, they need to come from the same class
                             return stopAtAnyPropertyDeclaration &&
                                 (ts.isPropertyDeclaration(declaration) && node.parent === declaration.parent
                                     || ts.isParameterPropertyDeclaration(declaration, declaration.parent) && node.parent === declaration.parent.parent)
                                 ? "quit" : true;
-                        case 227 /* Block */:
+                        case 230 /* Block */:
                             switch (node.parent.kind) {
-                                case 166 /* GetAccessor */:
-                                case 164 /* MethodDeclaration */:
-                                case 167 /* SetAccessor */:
+                                case 167 /* GetAccessor */:
+                                case 165 /* MethodDeclaration */:
+                                case 168 /* SetAccessor */:
                                     return true;
                                 default:
                                     return false;
@@ -43726,18 +44830,18 @@ var ts;
             }
             function requiresScopeChangeWorker(node) {
                 switch (node.kind) {
-                    case 206 /* ArrowFunction */:
-                    case 205 /* FunctionExpression */:
-                    case 248 /* FunctionDeclaration */:
-                    case 165 /* Constructor */:
+                    case 209 /* ArrowFunction */:
+                    case 208 /* FunctionExpression */:
+                    case 251 /* FunctionDeclaration */:
+                    case 166 /* Constructor */:
                         // do not descend into these
                         return false;
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 285 /* PropertyAssignment */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 288 /* PropertyAssignment */:
                         return requiresScopeChangeWorker(node.name);
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         // static properties in classes introduce temporary variables
                         if (ts.hasStaticModifier(node)) {
                             return target < 99 /* ESNext */ || !compilerOptions.useDefineForClassFields;
@@ -43791,12 +44895,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 & 788968 /* Type */ && lastLocation.kind !== 307 /* JSDocComment */) {
+                            if (meaning & result.flags & 788968 /* Type */ && lastLocation.kind !== 311 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 159 /* Parameter */ ||
-                                        lastLocation.kind === 158 /* TypeParameter */
+                                        lastLocation.kind === 160 /* Parameter */ ||
+                                        lastLocation.kind === 159 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -43811,13 +44915,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 === 159 /* Parameter */ ||
+                                        lastLocation.kind === 160 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 183 /* ConditionalType */) {
+                        else if (location.kind === 184 /* 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;
@@ -43832,14 +44936,14 @@ var ts;
                 }
                 withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 294 /* SourceFile */:
+                    case 297 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 253 /* ModuleDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports || emptySymbols;
-                        if (location.kind === 294 /* SourceFile */ || (ts.isModuleDeclaration(location) && location.flags & 8388608 /* Ambient */ && !ts.isGlobalScopeAugmentation(location))) {
+                        if (location.kind === 297 /* SourceFile */ || (ts.isModuleDeclaration(location) && location.flags & 8388608 /* Ambient */ && !ts.isGlobalScopeAugmentation(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 */)) {
@@ -43863,7 +44967,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                (ts.getDeclarationOfKind(moduleExport, 267 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 266 /* NamespaceExport */))) {
+                                (ts.getDeclarationOfKind(moduleExport, 270 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 269 /* NamespaceExport */))) {
                                 break;
                             }
                         }
@@ -43877,12 +44981,12 @@ var ts;
                             }
                         }
                         break;
-                    case 252 /* EnumDeclaration */:
+                    case 255 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* 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
@@ -43899,9 +45003,9 @@ var ts;
                             }
                         }
                         break;
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* 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!
@@ -43920,7 +45024,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 218 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 221 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -43928,7 +45032,7 @@ var ts;
                             }
                         }
                         break;
-                    case 220 /* ExpressionWithTypeArguments */:
+                    case 223 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
                         if (lastLocation === location.expression && location.parent.token === 93 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
@@ -43948,9 +45052,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 157 /* ComputedPropertyName */:
+                    case 158 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 250 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 253 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 788968 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -43958,24 +45062,24 @@ var ts;
                             }
                         }
                         break;
-                    case 206 /* ArrowFunction */:
+                    case 209 /* 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 164 /* MethodDeclaration */:
-                    case 165 /* Constructor */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 248 /* FunctionDeclaration */:
+                    case 165 /* MethodDeclaration */:
+                    case 166 /* Constructor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 251 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 205 /* FunctionExpression */:
+                    case 208 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -43988,7 +45092,7 @@ var ts;
                             }
                         }
                         break;
-                    case 160 /* Decorator */:
+                    case 161 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -43997,7 +45101,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 === 159 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 160 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -44012,17 +45116,17 @@ 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 === 249 /* ClassDeclaration */)) {
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 252 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 327 /* JSDocTypedefTag */:
-                    case 320 /* JSDocCallbackTag */:
-                    case 321 /* JSDocEnumTag */:
+                    case 331 /* JSDocTypedefTag */:
+                    case 324 /* JSDocCallbackTag */:
+                    case 325 /* JSDocEnumTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
-                    case 159 /* Parameter */:
+                    case 160 /* Parameter */:
                         if (lastLocation && (lastLocation === location.initializer ||
                             lastLocation === location.name && ts.isBindingPattern(lastLocation))) {
                             if (!associatedDeclarationForContainingInitializerOrBindingName) {
@@ -44030,14 +45134,20 @@ var ts;
                             }
                         }
                         break;
-                    case 195 /* BindingElement */:
+                    case 198 /* BindingElement */:
                         if (lastLocation && (lastLocation === location.initializer ||
                             lastLocation === location.name && ts.isBindingPattern(lastLocation))) {
-                            var root = ts.getRootDeclaration(location);
-                            if (root.kind === 159 /* Parameter */) {
-                                if (!associatedDeclarationForContainingInitializerOrBindingName) {
-                                    associatedDeclarationForContainingInitializerOrBindingName = location;
-                                }
+                            if (ts.isParameterDeclaration(location) && !associatedDeclarationForContainingInitializerOrBindingName) {
+                                associatedDeclarationForContainingInitializerOrBindingName = location;
+                            }
+                        }
+                        break;
+                    case 185 /* InferType */:
+                        if (meaning & 262144 /* TypeParameter */) {
+                            var parameterName = location.typeParameter.name;
+                            if (parameterName && name === parameterName.escapedText) {
+                                result = location.typeParameter.symbol;
+                                break loop;
                             }
                         }
                         break;
@@ -44056,7 +45166,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 294 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 297 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -44094,7 +45204,15 @@ var ts;
                             }
                         }
                         if (!suggestion) {
-                            error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg));
+                            if (nameArg) {
+                                var lib = getSuggestedLibForNonExistentName(nameArg);
+                                if (lib) {
+                                    error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg), lib);
+                                }
+                                else {
+                                    error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg));
+                                }
+                            }
                         }
                         suggestionCount++;
                     }
@@ -44173,10 +45291,10 @@ var ts;
             }
         }
         function getIsDeferredContext(location, lastLocation) {
-            if (location.kind !== 206 /* ArrowFunction */ && location.kind !== 205 /* FunctionExpression */) {
+            if (location.kind !== 209 /* ArrowFunction */ && location.kind !== 208 /* 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 === 162 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+                    (location.kind === 163 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(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;
@@ -44189,12 +45307,12 @@ var ts;
         }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 253 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 256 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -44206,7 +45324,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 === 158 /* TypeParameter */) {
+                if (decl.kind === 159 /* 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
@@ -44262,9 +45380,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 220 /* ExpressionWithTypeArguments */:
+                case 223 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -44308,7 +45426,7 @@ var ts;
             return name === "any" || name === "string" || name === "number" || name === "boolean" || name === "never" || name === "unknown";
         }
         function checkAndReportErrorForExportingPrimitiveType(errorLocation, name) {
-            if (isPrimitiveTypeName(name) && errorLocation.parent.kind === 267 /* ExportSpecifier */) {
+            if (isPrimitiveTypeName(name) && errorLocation.parent.kind === 270 /* ExportSpecifier */) {
                 error(errorLocation, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, name);
                 return true;
             }
@@ -44322,15 +45440,31 @@ var ts;
                 }
                 var symbol = resolveSymbol(resolveName(errorLocation, name, 788968 /* Type */ & ~111551 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
                 if (symbol && !(symbol.flags & 1024 /* NamespaceModule */)) {
-                    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));
+                    var rawName = ts.unescapeLeadingUnderscores(name);
+                    if (isES2015OrLaterConstructorName(name)) {
+                        error(errorLocation, 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, rawName);
+                    }
+                    else if (maybeMappedType(errorLocation, symbol)) {
+                        error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0, rawName, rawName === "K" ? "P" : "K");
+                    }
+                    else {
+                        error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, rawName);
+                    }
                     return true;
                 }
             }
             return false;
         }
+        function maybeMappedType(node, symbol) {
+            var container = ts.findAncestor(node.parent, function (n) {
+                return ts.isComputedPropertyName(n) || ts.isPropertySignature(n) ? false : ts.isTypeLiteralNode(n) || "quit";
+            });
+            if (container && container.members.length === 1) {
+                var type = getDeclaredTypeOfSymbol(symbol);
+                return !!(type.flags & 1048576 /* Union */) && allTypesAssignableToKind(type, 384 /* StringOrNumberLiteral */, /*strict*/ true);
+            }
+            return false;
+        }
         function isES2015OrLaterConstructorName(n) {
             switch (n) {
                 case "Promise":
@@ -44367,7 +45501,7 @@ var ts;
                 return;
             }
             // 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 === 252 /* EnumDeclaration */); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 255 /* EnumDeclaration */); });
             if (declaration === undefined)
                 return ts.Debug.fail("checkResolvedBlockScopedVariable could not find block-scoped declaration");
             if (!(declaration.flags & 8388608 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -44402,13 +45536,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return node;
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     return node.parent;
-                case 260 /* NamespaceImport */:
+                case 263 /* NamespaceImport */:
                     return node.parent.parent;
-                case 262 /* ImportSpecifier */:
+                case 265 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -44432,29 +45566,37 @@ var ts;
          * {name: <EntityNameExpression>}
          */
         function isAliasSymbolDeclaration(node) {
-            return node.kind === 257 /* ImportEqualsDeclaration */ ||
-                node.kind === 256 /* NamespaceExportDeclaration */ ||
-                node.kind === 259 /* ImportClause */ && !!node.name ||
-                node.kind === 260 /* NamespaceImport */ ||
-                node.kind === 266 /* NamespaceExport */ ||
-                node.kind === 262 /* ImportSpecifier */ ||
-                node.kind === 267 /* ExportSpecifier */ ||
-                node.kind === 263 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node) ||
-                ts.isBinaryExpression(node) && ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && ts.exportAssignmentIsAlias(node) ||
-                ts.isPropertyAccessExpression(node)
+            return node.kind === 260 /* ImportEqualsDeclaration */
+                || node.kind === 259 /* NamespaceExportDeclaration */
+                || node.kind === 262 /* ImportClause */ && !!node.name
+                || node.kind === 263 /* NamespaceImport */
+                || node.kind === 269 /* NamespaceExport */
+                || node.kind === 265 /* ImportSpecifier */
+                || node.kind === 270 /* ExportSpecifier */
+                || node.kind === 266 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node)
+                || ts.isBinaryExpression(node) && ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && ts.exportAssignmentIsAlias(node)
+                || ts.isAccessExpression(node)
                     && ts.isBinaryExpression(node.parent)
                     && node.parent.left === node
                     && node.parent.operatorToken.kind === 62 /* EqualsToken */
-                    && isAliasableOrJsExpression(node.parent.right) ||
-                node.kind === 286 /* ShorthandPropertyAssignment */ ||
-                node.kind === 285 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer);
+                    && isAliasableOrJsExpression(node.parent.right)
+                || node.kind === 289 /* ShorthandPropertyAssignment */
+                || node.kind === 288 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer)
+                || ts.isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true);
         }
         function isAliasableOrJsExpression(e) {
             return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 269 /* ExternalModuleReference */) {
-                var immediate = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node));
+            var commonJSPropertyAccess = getCommonJSPropertyAccess(node);
+            if (commonJSPropertyAccess) {
+                var name = ts.getLeftmostAccessExpression(commonJSPropertyAccess.expression).arguments[0];
+                return ts.isIdentifier(commonJSPropertyAccess.name)
+                    ? resolveSymbol(getPropertyOfType(resolveExternalModuleTypeByLiteral(name), commonJSPropertyAccess.name.escapedText))
+                    : undefined;
+            }
+            if (ts.isVariableDeclaration(node) || node.moduleReference.kind === 272 /* ExternalModuleReference */) {
+                var immediate = resolveExternalModuleName(node, ts.getExternalModuleRequireArgument(node) || ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var resolved_4 = resolveExternalModuleSymbol(immediate);
                 markSymbolOfAliasDeclarationIfTypeOnly(node, immediate, resolved_4, /*overwriteEmpty*/ false);
                 return resolved_4;
@@ -44481,10 +45623,7 @@ var ts;
         }
         function resolveExportByName(moduleSymbol, name, sourceNode, dontResolveAlias) {
             var exportValue = moduleSymbol.exports.get("export=" /* ExportEquals */);
-            if (exportValue) {
-                return getPropertyOfType(getTypeOfSymbol(exportValue), name);
-            }
-            var exportSymbol = moduleSymbol.exports.get(name);
+            var exportSymbol = exportValue ? getPropertyOfType(getTypeOfSymbol(exportValue), name) : moduleSymbol.exports.get(name);
             var resolved = resolveSymbol(exportSymbol, dontResolveAlias);
             markSymbolOfAliasDeclarationIfTypeOnly(sourceNode, exportSymbol, resolved, /*overwriteEmpty*/ false);
             return resolved;
@@ -44625,11 +45764,9 @@ var ts;
                 result.exports = new ts.Map(valueSymbol.exports);
             return result;
         }
-        function getExportOfModule(symbol, specifier, dontResolveAlias) {
-            var _a;
+        function getExportOfModule(symbol, name, specifier, dontResolveAlias) {
             if (symbol.flags & 1536 /* Module */) {
-                var name = ((_a = specifier.propertyName) !== null && _a !== void 0 ? _a : specifier.name).escapedText;
-                var exportSymbol = getExportsOfSymbol(symbol).get(name);
+                var exportSymbol = getExportsOfSymbol(symbol).get(name.escapedText);
                 var resolved = resolveSymbol(exportSymbol, dontResolveAlias);
                 markSymbolOfAliasDeclarationIfTypeOnly(specifier, exportSymbol, resolved, /*overwriteEmpty*/ false);
                 return resolved;
@@ -44646,10 +45783,14 @@ var ts;
         function getExternalModuleMember(node, specifier, dontResolveAlias) {
             var _a;
             if (dontResolveAlias === void 0) { dontResolveAlias = false; }
-            var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-            var name = specifier.propertyName || specifier.name;
+            var moduleSpecifier = ts.getExternalModuleRequireArgument(node) || node.moduleSpecifier;
+            var moduleSymbol = resolveExternalModuleName(node, moduleSpecifier); // TODO: GH#18217
+            var name = !ts.isPropertyAccessExpression(specifier) && specifier.propertyName || specifier.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
             var suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || compilerOptions.esModuleInterop);
-            var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier, dontResolveAlias, suppressInteropError);
+            var targetSymbol = resolveESModuleSymbol(moduleSymbol, moduleSpecifier, dontResolveAlias, suppressInteropError);
             if (targetSymbol) {
                 if (name.escapedText) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
@@ -44665,7 +45806,7 @@ var ts;
                     }
                     // if symbolFromVariable is export - get its final target
                     symbolFromVariable = resolveSymbol(symbolFromVariable, dontResolveAlias);
-                    var symbolFromModule = getExportOfModule(targetSymbol, specifier, dontResolveAlias);
+                    var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
                     if (symbolFromModule === undefined && name.escapedText === "default" /* Default */) {
                         var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                         if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias)) {
@@ -44681,7 +45822,7 @@ var ts;
                         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);
+                            var diagnostic = error(name, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
                                 ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
@@ -44742,10 +45883,21 @@ var ts;
             }
         }
         function getTargetOfImportSpecifier(node, dontResolveAlias) {
-            var resolved = getExternalModuleMember(node.parent.parent.parent, node, dontResolveAlias);
+            var root = ts.isBindingElement(node) ? ts.getRootDeclaration(node) : node.parent.parent.parent;
+            var commonJSPropertyAccess = getCommonJSPropertyAccess(root);
+            var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
+            var name = node.propertyName || node.name;
+            if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
+                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+            }
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
             return resolved;
         }
+        function getCommonJSPropertyAccess(node) {
+            if (ts.isVariableDeclaration(node) && node.initializer && ts.isPropertyAccessExpression(node.initializer)) {
+                return node.initializer;
+            }
+        }
         function getTargetOfNamespaceExportDeclaration(node, dontResolveAlias) {
             var resolved = resolveExternalModuleSymbol(node.parent.symbol, dontResolveAlias);
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
@@ -44782,7 +45934,7 @@ var ts;
             var expression = node.initializer;
             return getTargetOfAliasLikeExpression(expression, dontRecursivelyResolve);
         }
-        function getTargetOfPropertyAccessExpression(node, dontRecursivelyResolve) {
+        function getTargetOfAccessExpression(node, dontRecursivelyResolve) {
             if (!(ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 62 /* EqualsToken */)) {
                 return undefined;
             }
@@ -44791,29 +45943,32 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 260 /* NamespaceImport */:
+                case 263 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 266 /* NamespaceExport */:
+                case 269 /* NamespaceExport */:
                     return getTargetOfNamespaceExport(node, dontRecursivelyResolve);
-                case 262 /* ImportSpecifier */:
+                case 265 /* ImportSpecifier */:
+                case 198 /* BindingElement */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 267 /* ExportSpecifier */:
+                case 270 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 263 /* ExportAssignment */:
-                case 213 /* BinaryExpression */:
+                case 266 /* ExportAssignment */:
+                case 216 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 256 /* NamespaceExportDeclaration */:
+                case 259 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return resolveEntityName(node.name, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ true, dontRecursivelyResolve);
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     return getTargetOfPropertyAssignment(node, dontRecursivelyResolve);
-                case 198 /* PropertyAccessExpression */:
-                    return getTargetOfPropertyAccessExpression(node, dontRecursivelyResolve);
+                case 202 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                    return getTargetOfAccessExpression(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
             }
@@ -44880,7 +46035,7 @@ var ts;
          * @param overwriteEmpty Checks `resolvesToSymbol` for type-only declarations even if `aliasDeclaration`
          */
         function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
-            if (!aliasDeclaration)
+            if (!aliasDeclaration || ts.isPropertyAccessExpression(aliasDeclaration))
                 return false;
             // If the declaration itself is type-only, mark it and return.
             // No need to check what it resolves to.
@@ -44964,13 +46119,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 78 /* Identifier */ || entityName.parent.kind === 156 /* QualifiedName */) {
+            if (entityName.kind === 78 /* Identifier */ || entityName.parent.kind === 157 /* 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 === 257 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 260 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -44994,9 +46149,9 @@ var ts;
                     return getMergedSymbol(symbolFromJSPrototype);
                 }
             }
-            else if (name.kind === 156 /* QualifiedName */ || name.kind === 198 /* PropertyAccessExpression */) {
-                var left = name.kind === 156 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 156 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 157 /* QualifiedName */ || name.kind === 201 /* PropertyAccessExpression */) {
+                var left = name.kind === 157 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 157 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -45022,7 +46177,12 @@ var ts;
                 symbol = getMergedSymbol(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));
+                        var namespaceName = getFullyQualifiedName(namespace);
+                        var declarationName = ts.declarationNameToString(right);
+                        var suggestion = getSuggestedSymbolForNonexistentModule(right, namespace);
+                        suggestion ?
+                            error(right, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, namespaceName, declarationName, symbolToString(suggestion)) :
+                            error(right, ts.Diagnostics.Namespace_0_has_no_exported_member_1, namespaceName, declarationName);
                     }
                     return undefined;
                 }
@@ -45031,7 +46191,7 @@ var ts;
                 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.");
-            if (!ts.nodeIsSynthesized(name) && ts.isEntityName(name) && (symbol.flags & 2097152 /* Alias */ || name.parent.kind === 263 /* ExportAssignment */)) {
+            if (!ts.nodeIsSynthesized(name) && ts.isEntityName(name) && (symbol.flags & 2097152 /* Alias */ || name.parent.kind === 266 /* ExportAssignment */)) {
                 markSymbolOfAliasDeclarationIfTypeOnly(ts.getAliasDeclarationFromName(name), symbol, /*finalTarget*/ undefined, /*overwriteEmpty*/ true);
             }
             return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
@@ -45215,7 +46375,7 @@ var ts;
                     ? 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_com_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))
+                    /*details*/ undefined, ts.Diagnostics.Try_npm_i_save_dev_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));
         }
@@ -45257,7 +46417,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias, suppressInteropError) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!suppressInteropError && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 294 /* SourceFile */)) {
+                if (!suppressInteropError && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 297 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -45559,7 +46719,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_3 = members; _i < members_3.length; _i++) {
                 var member = members_3[_i];
-                if (member.kind === 165 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 166 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -45568,6 +46728,7 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
+            typeCatalog.push(result);
             return result;
         }
         function createIntrinsicType(kind, intrinsicName, objectFlags) {
@@ -45646,12 +46807,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 294 /* SourceFile */:
+                    case 297 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 253 /* ModuleDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         var sym = getSymbolOfNode(location);
                         // `sym` may not have exports if this module declaration is backed by the symbol for a `const` that's being rewritten
                         // into a namespace - in such cases, it's best to just let the namespace appear empty (the const members couldn't have referred
@@ -45660,9 +46821,9 @@ var ts;
                             return { value: result };
                         }
                         break;
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* InterfaceDeclaration */:
                         // Type parameters are bound into `members` lists so they can merge across declarations
                         // This is troublesome, since in all other respects, they behave like locals :cries:
                         // TODO: the below is shared with similar code in `resolveName` - in fact, rephrasing all this symbol
@@ -45745,7 +46906,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, 267 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 270 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         var candidate = getCandidateListForSymbol(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification);
                         if (candidate) {
@@ -45789,7 +46950,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, 267 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 270 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -45804,10 +46965,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 162 /* PropertyDeclaration */:
-                        case 164 /* MethodDeclaration */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
+                        case 163 /* PropertyDeclaration */:
+                        case 165 /* MethodDeclaration */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -45936,10 +47097,10 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -45948,6 +47109,7 @@ var ts;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
             function getIsDeclarationVisible(declaration) {
+                var _a, _b;
                 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
@@ -45967,6 +47129,14 @@ var ts;
                         && isDeclarationVisible(declaration.parent)) {
                         return addVisibleAlias(declaration, declaration);
                     }
+                    else if (symbol.flags & 2097152 /* Alias */ && ts.isBindingElement(declaration) && ts.isInJSFile(declaration) && ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.parent) // exported import-like top-level JS require statement
+                        && ts.isVariableDeclaration(declaration.parent.parent)
+                        && ((_b = declaration.parent.parent.parent) === null || _b === void 0 ? void 0 : _b.parent) && ts.isVariableStatement(declaration.parent.parent.parent.parent)
+                        && !ts.hasSyntacticModifier(declaration.parent.parent.parent.parent, 1 /* Export */)
+                        && declaration.parent.parent.parent.parent.parent // check if the thing containing the variable statement is visible (ie, the file)
+                        && isDeclarationVisible(declaration.parent.parent.parent.parent.parent)) {
+                        return addVisibleAlias(declaration, declaration.parent.parent.parent.parent);
+                    }
                     // Declaration is not visible
                     return false;
                 }
@@ -45986,14 +47156,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 175 /* TypeQuery */ ||
+            if (entityName.parent.kind === 176 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 157 /* ComputedPropertyName */) {
+                entityName.parent.kind === 158 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 156 /* QualifiedName */ || entityName.kind === 198 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 257 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 157 /* QualifiedName */ || entityName.kind === 201 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 260 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -46034,7 +47204,7 @@ var ts;
             function symbolToStringWorker(writer) {
                 var entity = builder(symbol, meaning, enclosingDeclaration, nodeFlags); // TODO: GH#18217
                 // add neverAsciiEscape for GH#39027
-                var printer = (enclosingDeclaration === null || enclosingDeclaration === void 0 ? void 0 : enclosingDeclaration.kind) === 294 /* SourceFile */ ? ts.createPrinter({ removeComments: true, neverAsciiEscape: true }) : ts.createPrinter({ removeComments: true });
+                var printer = (enclosingDeclaration === null || enclosingDeclaration === void 0 ? void 0 : enclosingDeclaration.kind) === 297 /* SourceFile */ ? ts.createPrinter({ removeComments: true, neverAsciiEscape: true }) : ts.createPrinter({ removeComments: true });
                 var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
                 printer.writeNode(4 /* Unspecified */, entity, /*sourceFile*/ sourceFile, writer);
                 return writer;
@@ -46046,10 +47216,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 174 /* ConstructorType */ : 173 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 175 /* ConstructorType */ : 174 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 169 /* ConstructSignature */ : 168 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 170 /* ConstructSignature */ : 169 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -46095,6 +47265,9 @@ var ts;
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 814775659 /* NodeBuilderFlagsMask */;
         }
+        function isClassInstanceSide(type) {
+            return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(ts.getObjectFlags(type) & 1073741824 /* IsClassInstanceClone */));
+        }
         function createNodeBuilder() {
             return {
                 typeToTypeNode: function (type, enclosingDeclaration, flags, tracker) {
@@ -46126,6 +47299,7 @@ var ts;
                 },
             };
             function withContext(enclosingDeclaration, flags, tracker, cb) {
+                var _a, _b;
                 ts.Debug.assert(enclosingDeclaration === undefined || (enclosingDeclaration.flags & 8 /* Synthesized */) === 0);
                 var context = {
                     enclosingDeclaration: enclosingDeclaration,
@@ -46149,6 +47323,9 @@ var ts;
                     approximateLength: 0
                 };
                 var resultingNode = cb(context);
+                if (context.truncating && context.flags & 1 /* NoTruncation */) {
+                    (_b = (_a = context.tracker) === null || _a === void 0 ? void 0 : _a.reportTruncationError) === null || _b === void 0 ? void 0 : _b.call(_a);
+                }
                 return context.encounteredError ? undefined : resultingNode;
             }
             function checkTruncationLength(context) {
@@ -46175,22 +47352,22 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
+                    return ts.factory.createKeywordTypeNode(type === intrinsicMarkerType ? 136 /* IntrinsicKeyword */ : 128 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */);
+                    return ts.factory.createKeywordTypeNode(152 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.factory.createKeywordTypeNode(146 /* StringKeyword */);
+                    return ts.factory.createKeywordTypeNode(147 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.factory.createKeywordTypeNode(143 /* NumberKeyword */);
+                    return ts.factory.createKeywordTypeNode(144 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.factory.createKeywordTypeNode(154 /* BigIntKeyword */);
+                    return ts.factory.createKeywordTypeNode(155 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
@@ -46199,10 +47376,23 @@ var ts;
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
                     var parentName = symbolToTypeNode(parentSymbol, context, 788968 /* Type */);
-                    var enumLiteralName = getDeclaredTypeOfSymbol(parentSymbol) === type
-                        ? parentName
-                        : appendReferenceToType(parentName, ts.factory.createTypeReferenceNode(ts.symbolName(type.symbol), /*typeArguments*/ undefined));
-                    return enumLiteralName;
+                    if (getDeclaredTypeOfSymbol(parentSymbol) === type) {
+                        return parentName;
+                    }
+                    var memberName = ts.symbolName(type.symbol);
+                    if (ts.isIdentifierText(memberName, 0 /* ES3 */)) {
+                        return appendReferenceToType(parentName, ts.factory.createTypeReferenceNode(memberName, /*typeArguments*/ undefined));
+                    }
+                    if (ts.isImportTypeNode(parentName)) {
+                        parentName.isTypeOf = true; // mutably update, node is freshly manufactured anyhow
+                        return ts.factory.createIndexedAccessTypeNode(parentName, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
+                    }
+                    else if (ts.isTypeReferenceNode(parentName)) {
+                        return ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeQueryNode(parentName.typeName), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(memberName)));
+                    }
+                    else {
+                        return ts.Debug.fail("Unhandled type node kind returned from `symbolToTypeNode`.");
+                    }
                 }
                 if (type.flags & 1056 /* EnumLike */) {
                     return symbolToTypeNode(type.symbol, context, 788968 /* Type */);
@@ -46235,7 +47425,7 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.factory.createTypeOperatorNode(150 /* UniqueKeyword */, ts.factory.createKeywordTypeNode(147 /* SymbolKeyword */));
+                    return ts.factory.createTypeOperatorNode(151 /* UniqueKeyword */, ts.factory.createKeywordTypeNode(148 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
@@ -46243,7 +47433,7 @@ var ts;
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */);
+                    return ts.factory.createKeywordTypeNode(150 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
@@ -46251,15 +47441,15 @@ var ts;
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.factory.createKeywordTypeNode(140 /* NeverKeyword */);
+                    return ts.factory.createKeywordTypeNode(141 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.factory.createKeywordTypeNode(147 /* SymbolKeyword */);
+                    return ts.factory.createKeywordTypeNode(148 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.factory.createKeywordTypeNode(144 /* ObjectKeyword */);
+                    return ts.factory.createKeywordTypeNode(145 /* ObjectKeyword */);
                 }
                 if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
@@ -46327,7 +47517,19 @@ var ts;
                     var indexedType = type.type;
                     context.approximateLength += 6;
                     var indexTypeNode = typeToTypeNodeHelper(indexedType, context);
-                    return ts.factory.createTypeOperatorNode(137 /* KeyOfKeyword */, indexTypeNode);
+                    return ts.factory.createTypeOperatorNode(138 /* KeyOfKeyword */, indexTypeNode);
+                }
+                if (type.flags & 134217728 /* TemplateLiteral */) {
+                    var texts_1 = type.texts;
+                    var types_1 = type.types;
+                    var templateHead = ts.factory.createTemplateHead(texts_1[0]);
+                    var templateSpans = ts.factory.createNodeArray(ts.map(types_1, function (t, i) { return ts.factory.createTemplateLiteralTypeSpan(typeToTypeNodeHelper(t, context), (i < types_1.length - 1 ? ts.factory.createTemplateMiddle : ts.factory.createTemplateTail)(texts_1[i + 1])); }));
+                    context.approximateLength += 2;
+                    return ts.factory.createTemplateLiteralType(templateHead, templateSpans);
+                }
+                if (type.flags & 268435456 /* StringMapping */) {
+                    var typeNode = typeToTypeNodeHelper(type.type, context);
+                    return symbolToTypeNode(type.symbol, context, 788968 /* Type */, [typeNode]);
                 }
                 if (type.flags & 8388608 /* IndexedAccess */) {
                     var objectTypeNode = typeToTypeNodeHelper(type.objectType, context);
@@ -46372,14 +47574,15 @@ var ts;
                     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.factory.createTypeOperatorNode(137 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context));
+                        appropriateConstraintTypeNode = ts.factory.createTypeOperatorNode(138 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context));
                     }
                     else {
                         appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type), context);
                     }
                     var typeParameterNode = typeParameterToDeclarationWithConstraint(getTypeParameterFromMappedType(type), context, appropriateConstraintTypeNode);
+                    var nameTypeNode = type.declaration.nameType ? typeToTypeNodeHelper(getNameTypeFromMappedType(type), context) : undefined;
                     var templateTypeNode = typeToTypeNodeHelper(getTemplateTypeFromMappedType(type), context);
-                    var mappedTypeNode = ts.factory.createMappedTypeNode(readonlyToken, typeParameterNode, questionToken, templateTypeNode);
+                    var mappedTypeNode = ts.factory.createMappedTypeNode(readonlyToken, typeParameterNode, nameTypeNode, questionToken, templateTypeNode);
                     context.approximateLength += 10;
                     return ts.setEmitFlags(mappedTypeNode, 1 /* SingleLine */);
                 }
@@ -46388,16 +47591,16 @@ var ts;
                     var typeId = type.id;
                     var symbol = type.symbol;
                     if (symbol) {
+                        var isInstanceType = isClassInstanceSide(type) ? 788968 /* Type */ : 111551 /* Value */;
                         if (isJSConstructor(symbol.valueDeclaration)) {
                             // Instance and static types share the same symbol; only add 'typeof' for the static side.
-                            var isInstanceType = type === getDeclaredTypeOfClassOrInterface(symbol) ? 788968 /* Type */ : 111551 /* 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 === 218 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 221 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
-                            return symbolToTypeNode(symbol, context, 111551 /* Value */);
+                            return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         else if ((_a = context.visitedTypes) === null || _a === void 0 ? void 0 : _a.has(typeId)) {
                             // If type is an anonymous type literal in a type alias declaration, use type alias name
@@ -46425,7 +47628,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 === 294 /* SourceFile */ || declaration.parent.kind === 254 /* ModuleBlock */;
+                                    return declaration.parent.kind === 297 /* SourceFile */ || declaration.parent.kind === 257 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -46476,12 +47679,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 173 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 174 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 174 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 175 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -46502,7 +47705,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.factory.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.factory.createTypeOperatorNode(142 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -46526,12 +47729,12 @@ var ts;
                                     }
                                 }
                                 var tupleTypeNode = ts.setEmitFlags(ts.factory.createTupleTypeNode(tupleConstituentNodes), 1 /* SingleLine */);
-                                return type.target.readonly ? ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.factory.createTypeOperatorNode(142 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.setEmitFlags(ts.factory.createTupleTypeNode([]), 1 /* SingleLine */);
-                            return type.target.readonly ? ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.factory.createTypeOperatorNode(142 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -46559,10 +47762,10 @@ var ts;
                                 // 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;
+                                    var flags_3 = context.flags;
                                     context.flags |= 16 /* ForbidIndexedAccessSymbolReferences */;
                                     var ref = symbolToTypeNode(parent, context, 788968 /* Type */, typeArgumentSlice);
-                                    context.flags = flags_2;
+                                    context.flags = flags_3;
                                     resultType = !resultType ? ref : appendReferenceToType(resultType, ref);
                                 }
                             }
@@ -46638,11 +47841,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 168 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 169 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 169 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 170 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -46718,7 +47921,7 @@ var ts;
                     var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 163 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 164 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
                         typeElements.push(preserveCommentsOn(methodDeclaration));
                     }
                 }
@@ -46733,7 +47936,7 @@ var ts;
                         propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.factory.createToken(141 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.factory.createToken(142 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -46741,8 +47944,8 @@ var ts;
                     typeElements.push(preserveCommentsOn(propertySignature));
                 }
                 function preserveCommentsOn(node) {
-                    if (ts.some(propertySymbol.declarations, function (d) { return d.kind === 328 /* JSDocPropertyTag */; })) {
-                        var d = ts.find(propertySymbol.declarations, function (d) { return d.kind === 328 /* JSDocPropertyTag */; });
+                    if (ts.some(propertySymbol.declarations, function (d) { return d.kind === 333 /* JSDocPropertyTag */; })) {
+                        var d = ts.find(propertySymbol.declarations, function (d) { return d.kind === 333 /* JSDocPropertyTag */; });
                         var commentText = d.comment;
                         if (commentText) {
                             ts.setSyntheticLeadingComments(node, [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]);
@@ -46774,8 +47977,8 @@ var ts;
                     var seenNames = mayHaveNameCollisions ? ts.createUnderscoreEscapedMultiMap() : undefined;
                     var result_4 = [];
                     var i = 0;
-                    for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
-                        var type = types_1[_i];
+                    for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                        var type = types_2[_i];
                         i++;
                         if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
                             result_4.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined));
@@ -46810,8 +48013,8 @@ var ts;
                                 var b = _b[0];
                                 return typesAreSameReference(a, b);
                             })) {
-                                for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
-                                    var _a = types_2[_i], type = _a[0], resultIndex = _a[1];
+                                for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                                    var _a = types_3[_i], type = _a[0], resultIndex = _a[1];
                                     result_4[resultIndex] = typeToTypeNodeHelper(type, context);
                                 }
                             }
@@ -46828,7 +48031,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context, typeNode) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.factory.createKeywordTypeNode(kind === 0 /* String */ ? 146 /* StringKeyword */ : 143 /* NumberKeyword */);
+                var indexerTypeNode = ts.factory.createKeywordTypeNode(kind === 0 /* String */ ? 147 /* StringKeyword */ : 144 /* NumberKeyword */);
                 var indexingParameter = ts.factory.createParameterDeclaration(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -46843,7 +48046,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.factory.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.factory.createToken(141 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.factory.createToken(142 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
                 var _a, _b, _c, _d;
@@ -46858,7 +48061,9 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature, /*skipUnionExpanding*/ true)[0].map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 165 /* Constructor */, options === null || options === void 0 ? void 0 : options.privateSymbolVisitor, options === null || options === void 0 ? void 0 : options.bundledImports); });
+                var expandedParams = getExpandedParameters(signature, /*skipUnionExpanding*/ true)[0];
+                // If the expanded parameter list had a variadic in a non-trailing position, don't expand it
+                var parameters = (ts.some(expandedParams, function (p) { return p !== expandedParams[expandedParams.length - 1] && !!(ts.getCheckFlags(p) & 32768 /* RestParameter */); }) ? signature.parameters : expandedParams).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 166 /* Constructor */, options === null || options === void 0 ? void 0 : options.privateSymbolVisitor, options === null || options === void 0 ? void 0 : options.bundledImports); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -46885,20 +48090,20 @@ var ts;
                     }
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
-                var node = kind === 168 /* CallSignature */ ? ts.factory.createCallSignature(typeParameters, parameters, returnTypeNode) :
-                    kind === 169 /* ConstructSignature */ ? ts.factory.createConstructSignature(typeParameters, parameters, returnTypeNode) :
-                        kind === 163 /* MethodSignature */ ? ts.factory.createMethodSignature(options === null || options === void 0 ? void 0 : options.modifiers, (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : ts.factory.createIdentifier(""), options === null || options === void 0 ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) :
-                            kind === 164 /* MethodDeclaration */ ? ts.factory.createMethodDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (_b = options === null || options === void 0 ? void 0 : options.name) !== null && _b !== void 0 ? _b : ts.factory.createIdentifier(""), /*questionToken*/ undefined, typeParameters, parameters, returnTypeNode, /*body*/ undefined) :
-                                kind === 165 /* Constructor */ ? ts.factory.createConstructorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, /*body*/ undefined) :
-                                    kind === 166 /* GetAccessor */ ? ts.factory.createGetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_c = options === null || options === void 0 ? void 0 : options.name) !== null && _c !== void 0 ? _c : ts.factory.createIdentifier(""), parameters, returnTypeNode, /*body*/ undefined) :
-                                        kind === 167 /* SetAccessor */ ? ts.factory.createSetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_d = options === null || options === void 0 ? void 0 : options.name) !== null && _d !== void 0 ? _d : ts.factory.createIdentifier(""), parameters, /*body*/ undefined) :
-                                            kind === 170 /* IndexSignature */ ? ts.factory.createIndexSignature(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, returnTypeNode) :
-                                                kind === 304 /* JSDocFunctionType */ ? ts.factory.createJSDocFunctionType(parameters, returnTypeNode) :
-                                                    kind === 173 /* FunctionType */ ? ts.factory.createFunctionTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
-                                                        kind === 174 /* ConstructorType */ ? ts.factory.createConstructorTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
-                                                            kind === 248 /* FunctionDeclaration */ ? ts.factory.createFunctionDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, /*body*/ undefined) :
-                                                                kind === 205 /* FunctionExpression */ ? ts.factory.createFunctionExpression(options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, ts.factory.createBlock([])) :
-                                                                    kind === 206 /* ArrowFunction */ ? ts.factory.createArrowFunction(options === null || options === void 0 ? void 0 : options.modifiers, typeParameters, parameters, returnTypeNode, /*equalsGreaterThanToken*/ undefined, ts.factory.createBlock([])) :
+                var node = kind === 169 /* CallSignature */ ? ts.factory.createCallSignature(typeParameters, parameters, returnTypeNode) :
+                    kind === 170 /* ConstructSignature */ ? ts.factory.createConstructSignature(typeParameters, parameters, returnTypeNode) :
+                        kind === 164 /* MethodSignature */ ? ts.factory.createMethodSignature(options === null || options === void 0 ? void 0 : options.modifiers, (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : ts.factory.createIdentifier(""), options === null || options === void 0 ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) :
+                            kind === 165 /* MethodDeclaration */ ? ts.factory.createMethodDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (_b = options === null || options === void 0 ? void 0 : options.name) !== null && _b !== void 0 ? _b : ts.factory.createIdentifier(""), /*questionToken*/ undefined, typeParameters, parameters, returnTypeNode, /*body*/ undefined) :
+                                kind === 166 /* Constructor */ ? ts.factory.createConstructorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, /*body*/ undefined) :
+                                    kind === 167 /* GetAccessor */ ? ts.factory.createGetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_c = options === null || options === void 0 ? void 0 : options.name) !== null && _c !== void 0 ? _c : ts.factory.createIdentifier(""), parameters, returnTypeNode, /*body*/ undefined) :
+                                        kind === 168 /* SetAccessor */ ? ts.factory.createSetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_d = options === null || options === void 0 ? void 0 : options.name) !== null && _d !== void 0 ? _d : ts.factory.createIdentifier(""), parameters, /*body*/ undefined) :
+                                            kind === 171 /* IndexSignature */ ? ts.factory.createIndexSignature(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, returnTypeNode) :
+                                                kind === 308 /* JSDocFunctionType */ ? ts.factory.createJSDocFunctionType(parameters, returnTypeNode) :
+                                                    kind === 174 /* FunctionType */ ? ts.factory.createFunctionTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
+                                                        kind === 175 /* ConstructorType */ ? ts.factory.createConstructorTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
+                                                            kind === 251 /* FunctionDeclaration */ ? ts.factory.createFunctionDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, /*body*/ undefined) :
+                                                                kind === 208 /* FunctionExpression */ ? ts.factory.createFunctionExpression(options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, ts.factory.createBlock([])) :
+                                                                    kind === 209 /* ArrowFunction */ ? ts.factory.createArrowFunction(options === null || options === void 0 ? void 0 : options.modifiers, typeParameters, parameters, returnTypeNode, /*equalsGreaterThanToken*/ undefined, ts.factory.createBlock([])) :
                                                                         ts.Debug.assertNever(kind);
                 if (typeArguments) {
                     node.typeArguments = ts.factory.createNodeArray(typeArguments);
@@ -46920,9 +48125,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags, privateSymbolVisitor, bundledImports) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 159 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 160 /* Parameter */);
                 if (!parameterDeclaration && !ts.isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 322 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 326 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -46937,7 +48142,7 @@ var ts;
                 var dotDotDotToken = isRest ? ts.factory.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration ? parameterDeclaration.name ?
                     parameterDeclaration.name.kind === 78 /* Identifier */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                        parameterDeclaration.name.kind === 156 /* QualifiedName */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 157 /* QualifiedName */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                             cloneBindingName(parameterDeclaration.name) :
                     ts.symbolName(parameterSymbol) :
                     ts.symbolName(parameterSymbol);
@@ -47102,11 +48307,11 @@ var ts;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
                 var _a;
-                var file = ts.getDeclarationOfKind(symbol, 294 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 297 /* SourceFile */);
                 if (!file) {
                     var equivalentFileSymbol = ts.firstDefined(symbol.declarations, function (d) { return getFileSymbolIfFileSymbolExportEqualsContainer(d, symbol); });
                     if (equivalentFileSymbol) {
-                        file = ts.getDeclarationOfKind(equivalentFileSymbol, 294 /* SourceFile */);
+                        file = ts.getDeclarationOfKind(equivalentFileSymbol, 297 /* SourceFile */);
                     }
                 }
                 if (file && file.moduleName !== undefined) {
@@ -47145,7 +48350,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative", importModuleSpecifierEnding: isBundle_1 ? "minimal" : undefined }));
                     (_a = links.specifierCache) !== null && _a !== void 0 ? _a : (links.specifierCache = new ts.Map());
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -47451,7 +48656,7 @@ var ts;
                 }
                 var oldFlags = context.flags;
                 if (type.flags & 8192 /* UniqueESSymbol */ &&
-                    type.symbol === symbol) {
+                    type.symbol === symbol && (!context.enclosingDeclaration || ts.some(symbol.declarations, function (d) { return ts.getSourceFileOfNode(d) === ts.getSourceFileOfNode(context.enclosingDeclaration); }))) {
                     context.flags |= 1048576 /* AllowUniqueESSymbolType */;
                 }
                 var result = typeToTypeNodeHelper(type, context);
@@ -47484,17 +48689,17 @@ var ts;
                 function visitExistingNodeTreeSymbols(node) {
                     var _a, _b;
                     // We don't _actually_ support jsdoc namepath types, emit `any` instead
-                    if (ts.isJSDocAllType(node) || node.kind === 306 /* JSDocNamepathType */) {
+                    if (ts.isJSDocAllType(node) || node.kind === 310 /* JSDocNamepathType */) {
                         return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
                     }
                     if (ts.isJSDocUnknownType(node)) {
-                        return ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */);
+                        return ts.factory.createKeywordTypeNode(152 /* UnknownKeyword */);
                     }
                     if (ts.isJSDocNullableType(node)) {
                         return ts.factory.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.factory.createLiteralTypeNode(ts.factory.createNull())]);
                     }
                     if (ts.isJSDocOptionalType(node)) {
-                        return ts.factory.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */)]);
+                        return ts.factory.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.factory.createKeywordTypeNode(150 /* UndefinedKeyword */)]);
                     }
                     if (ts.isJSDocNonNullableType(node)) {
                         return ts.visitNode(node.type, visitExistingNodeTreeSymbols);
@@ -47608,8 +48813,8 @@ var ts;
                 }
             }
             function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
-                var serializePropertySymbolForClass = makeSerializePropertySymbol(ts.factory.createPropertyDeclaration, 164 /* MethodDeclaration */, /*useAcessors*/ true);
-                var serializePropertySymbolForInterfaceWorker = makeSerializePropertySymbol(function (_decorators, mods, name, question, type) { return ts.factory.createPropertySignature(mods, name, question, type); }, 163 /* MethodSignature */, /*useAcessors*/ false);
+                var serializePropertySymbolForClass = makeSerializePropertySymbol(ts.factory.createPropertyDeclaration, 165 /* MethodDeclaration */, /*useAcessors*/ true);
+                var serializePropertySymbolForInterfaceWorker = makeSerializePropertySymbol(function (_decorators, mods, name, question, type) { return ts.factory.createPropertySignature(mods, name, question, type); }, 164 /* MethodSignature */, /*useAcessors*/ false);
                 // TODO: Use `setOriginalNode` on original declaration names where possible so these declarations see some kind of
                 // declaration mapping
                 // We save the enclosing declaration off here so it's not adjusted by well-meaning declaration
@@ -47888,38 +49093,50 @@ var ts;
                                 if (textRange && ts.isVariableDeclarationList(textRange.parent) && textRange.parent.declarations.length === 1) {
                                     textRange = textRange.parent.parent;
                                 }
-                                var statement = ts.setTextRange(ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([
-                                    ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled))
-                                ], flags)), textRange);
-                                addResult(statement, name !== localName ? modifierFlags & ~1 /* Export */ : modifierFlags);
-                                if (name !== localName && !isPrivate) {
-                                    // We rename the variable declaration we generate for Property symbols since they may have a name which
-                                    // conflicts with a local declaration. For example, given input:
-                                    // ```
-                                    // function g() {}
-                                    // module.exports.g = g
-                                    // ```
-                                    // In such a situation, we have a local variable named `g`, and a separate exported variable named `g`.
-                                    // Naively, we would emit
-                                    // ```
-                                    // function g() {}
-                                    // export const g: typeof g;
-                                    // ```
-                                    // That's obviously incorrect - the `g` in the type annotation needs to refer to the local `g`, but
-                                    // the export declaration shadows it.
-                                    // To work around that, we instead write
-                                    // ```
-                                    // function g() {}
-                                    // const g_1: typeof g;
-                                    // export { g_1 as g };
-                                    // ```
-                                    // To create an export named `g` that does _not_ shadow the local `g`
+                                var propertyAccessRequire = ts.find(symbol.declarations, ts.isPropertyAccessExpression);
+                                if (propertyAccessRequire && ts.isBinaryExpression(propertyAccessRequire.parent) && ts.isIdentifier(propertyAccessRequire.parent.right)
+                                    && type.symbol && ts.isSourceFile(type.symbol.valueDeclaration)) {
+                                    var alias = localName === propertyAccessRequire.parent.right.escapedText ? undefined : propertyAccessRequire.parent.right;
                                     addResult(ts.factory.createExportDeclaration(
                                     /*decorators*/ undefined, 
                                     /*modifiers*/ undefined, 
-                                    /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(name, localName)])), 0 /* None */);
-                                    needsExportDeclaration = false;
-                                    needsPostExportDefault = false;
+                                    /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(alias, localName)])), 0 /* None */);
+                                    context.tracker.trackSymbol(type.symbol, context.enclosingDeclaration, 111551 /* Value */);
+                                }
+                                else {
+                                    var statement = ts.setTextRange(ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([
+                                        ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled))
+                                    ], flags)), textRange);
+                                    addResult(statement, name !== localName ? modifierFlags & ~1 /* Export */ : modifierFlags);
+                                    if (name !== localName && !isPrivate) {
+                                        // We rename the variable declaration we generate for Property symbols since they may have a name which
+                                        // conflicts with a local declaration. For example, given input:
+                                        // ```
+                                        // function g() {}
+                                        // module.exports.g = g
+                                        // ```
+                                        // In such a situation, we have a local variable named `g`, and a separate exported variable named `g`.
+                                        // Naively, we would emit
+                                        // ```
+                                        // function g() {}
+                                        // export const g: typeof g;
+                                        // ```
+                                        // That's obviously incorrect - the `g` in the type annotation needs to refer to the local `g`, but
+                                        // the export declaration shadows it.
+                                        // To work around that, we instead write
+                                        // ```
+                                        // function g() {}
+                                        // const g_1: typeof g;
+                                        // export { g_1 as g };
+                                        // ```
+                                        // To create an export named `g` that does _not_ shadow the local `g`
+                                        addResult(ts.factory.createExportDeclaration(
+                                        /*decorators*/ undefined, 
+                                        /*modifiers*/ undefined, 
+                                        /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(name, localName)])), 0 /* None */);
+                                        needsExportDeclaration = false;
+                                        needsPostExportDefault = false;
+                                    }
                                 }
                             }
                         }
@@ -47941,7 +49158,8 @@ var ts;
                     if ((symbol.flags & (512 /* ValueModule */ | 1024 /* NamespaceModule */) && (!isConstMergedWithNS || isTypeOnlyNamespace(symbol))) || isConstMergedWithNSPrintableAsSignatureMerge) {
                         serializeModule(symbol, symbolName, modifierFlags);
                     }
-                    if (symbol.flags & 64 /* Interface */) {
+                    // The class meaning serialization should handle serializing all interface members
+                    if (symbol.flags & 64 /* Interface */ && !(symbol.flags & 32 /* Class */)) {
                         serializeInterface(symbol, symbolName, modifierFlags);
                     }
                     if (symbol.flags & 2097152 /* Alias */) {
@@ -48036,8 +49254,8 @@ var ts;
                     var baseTypes = getBaseTypes(interfaceType);
                     var baseType = ts.length(baseTypes) ? getIntersectionType(baseTypes) : undefined;
                     var members = ts.flatMap(getPropertiesOfType(interfaceType), function (p) { return serializePropertySymbolForInterface(p, baseType); });
-                    var callSignatures = serializeSignatures(0 /* Call */, interfaceType, baseType, 168 /* CallSignature */);
-                    var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 169 /* ConstructSignature */);
+                    var callSignatures = serializeSignatures(0 /* Call */, interfaceType, baseType, 169 /* CallSignature */);
+                    var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 170 /* ConstructSignature */);
                     var indexSignatures = serializeIndexSignatures(interfaceType, baseType);
                     var heritageClauses = !ts.length(baseTypes) ? undefined : [ts.factory.createHeritageClause(93 /* ExtendsKeyword */, ts.mapDefined(baseTypes, function (b) { return trySerializeAsTypeReference(b, 111551 /* Value */); }))];
                     addResult(ts.factory.createInterfaceDeclaration(
@@ -48106,7 +49324,7 @@ var ts;
                     for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                         var sig = signatures_2[_i];
                         // Each overload becomes a separate function declaration, in order
-                        var decl = signatureToSignatureDeclarationHelper(sig, 248 /* FunctionDeclaration */, context, { name: ts.factory.createIdentifier(localName), privateSymbolVisitor: includePrivateSymbol, bundledImports: bundled });
+                        var decl = signatureToSignatureDeclarationHelper(sig, 251 /* FunctionDeclaration */, context, { name: ts.factory.createIdentifier(localName), privateSymbolVisitor: includePrivateSymbol, bundledImports: bundled });
                         // for expressions assigned to `var`s, use the `var` as the text range
                         addResult(ts.setTextRange(decl, sig.declaration && ts.isVariableDeclaration(sig.declaration.parent) && sig.declaration.parent.parent || sig.declaration), modifierFlags);
                     }
@@ -48169,7 +49387,7 @@ var ts;
                 }
                 function isNamespaceMember(p) {
                     return !!(p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) ||
-                        !(p.flags & 4194304 /* Prototype */ || p.escapedName === "prototype" || p.valueDeclaration && ts.isClassLike(p.valueDeclaration.parent));
+                        !(p.flags & 4194304 /* Prototype */ || p.escapedName === "prototype" || p.valueDeclaration && ts.getEffectiveModifierFlags(p.valueDeclaration) & 32 /* Static */ && ts.isClassLike(p.valueDeclaration.parent));
                 }
                 function serializeAsClass(symbol, localName, modifierFlags) {
                     var _a;
@@ -48220,13 +49438,14 @@ var ts;
                         !ts.some(getSignaturesOfType(staticType, 1 /* Construct */));
                     var constructors = isNonConstructableClassLikeInJsFile ?
                         [ts.factory.createConstructorDeclaration(/*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(8 /* Private */), [], /*body*/ undefined)] :
-                        serializeSignatures(1 /* Construct */, staticType, baseTypes[0], 165 /* Constructor */);
+                        serializeSignatures(1 /* Construct */, staticType, baseTypes[0], 166 /* Constructor */);
                     var indexSignatures = serializeIndexSignatures(classType, baseTypes[0]);
                     addResult(ts.setTextRange(ts.factory.createClassDeclaration(
                     /*decorators*/ undefined, 
                     /*modifiers*/ undefined, localName, typeParamDecls, heritageClauses, __spreadArrays(indexSignatures, staticMembers, constructors, publicProperties, privateProperties)), symbol.declarations && ts.filter(symbol.declarations, function (d) { return ts.isClassDeclaration(d) || ts.isClassExpression(d); })[0]), modifierFlags);
                 }
                 function serializeAsAlias(symbol, localName, modifierFlags) {
+                    var _a, _b, _c, _d, _e;
                     // synthesize an alias, eg `export { symbolName as Name }`
                     // need to mark the alias `symbol` points at
                     // as something we need to serialize as a private declaration as well
@@ -48245,23 +49464,66 @@ var ts;
                     var targetName = getInternalSymbolName(target, verbatimTargetName);
                     includePrivateSymbol(target); // the target may be within the same scope - attempt to serialize it first
                     switch (node.kind) {
-                        case 257 /* ImportEqualsDeclaration */:
+                        case 198 /* BindingElement */:
+                            if (((_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === 249 /* VariableDeclaration */) {
+                                // const { SomeClass } = require('./lib');
+                                var specifier_1 = getSpecifierForModuleSymbol(target.parent || target, context); // './lib'
+                                var propertyName = node.propertyName;
+                                addResult(ts.factory.createImportDeclaration(
+                                /*decorators*/ undefined, 
+                                /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*name*/ undefined, ts.factory.createNamedImports([ts.factory.createImportSpecifier(propertyName && ts.isIdentifier(propertyName) ? ts.factory.createIdentifier(ts.idText(propertyName)) : undefined, ts.factory.createIdentifier(localName))])), ts.factory.createStringLiteral(specifier_1)), 0 /* None */);
+                                break;
+                            }
+                            // We don't know how to serialize this (nested?) binding element
+                            ts.Debug.failBadSyntaxKind(((_c = node.parent) === null || _c === void 0 ? void 0 : _c.parent) || node, "Unhandled binding element grandparent kind in declaration serialization");
+                            break;
+                        case 289 /* ShorthandPropertyAssignment */:
+                            if (((_e = (_d = node.parent) === null || _d === void 0 ? void 0 : _d.parent) === null || _e === void 0 ? void 0 : _e.kind) === 216 /* BinaryExpression */) {
+                                // module.exports = { SomeClass }
+                                serializeExportSpecifier(ts.unescapeLeadingUnderscores(symbol.escapedName), targetName);
+                            }
+                            break;
+                        case 249 /* VariableDeclaration */:
+                            // commonjs require: const x = require('y')
+                            if (ts.isPropertyAccessExpression(node.initializer)) {
+                                // const x = require('y').z
+                                var initializer = node.initializer; // require('y').z
+                                var uniqueName = ts.factory.createUniqueName(localName); // _x
+                                var specifier_2 = getSpecifierForModuleSymbol(target.parent || target, context); // 'y'
+                                // import _x = require('y');
+                                addResult(ts.factory.createImportEqualsDeclaration(
+                                /*decorators*/ undefined, 
+                                /*modifiers*/ undefined, uniqueName, ts.factory.createExternalModuleReference(ts.factory.createStringLiteral(specifier_2))), 0 /* None */);
+                                // import x = _x.z
+                                addResult(ts.factory.createImportEqualsDeclaration(
+                                /*decorators*/ undefined, 
+                                /*modifiers*/ undefined, ts.factory.createIdentifier(localName), ts.factory.createQualifiedName(uniqueName, initializer.name)), modifierFlags);
+                                break;
+                            }
+                        // else fall through and treat commonjs require just like import=
+                        case 260 /* ImportEqualsDeclaration */:
+                            // This _specifically_ only exists to handle json declarations - where we make aliases, but since
+                            // we emit no declarations for the json document, must not refer to it in the declarations
+                            if (target.escapedName === "export=" /* ExportEquals */ && ts.some(target.declarations, ts.isJsonSourceFile)) {
+                                serializeMaybeAliasAssignment(symbol);
+                                break;
+                            }
                             // Could be a local `import localName = ns.member` or
                             // an external `import localName = require("whatever")`
-                            var isLocalImport = !(target.flags & 512 /* ValueModule */);
+                            var isLocalImport = !(target.flags & 512 /* ValueModule */) && !ts.isVariableDeclaration(node);
                             addResult(ts.factory.createImportEqualsDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createIdentifier(localName), isLocalImport
                                 ? symbolToName(target, context, 67108863 /* All */, /*expectsIdentifier*/ false)
-                                : ts.factory.createExternalModuleReference(ts.factory.createStringLiteral(getSpecifierForModuleSymbol(symbol, context)))), isLocalImport ? modifierFlags : 0 /* None */);
+                                : ts.factory.createExternalModuleReference(ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context)))), isLocalImport ? modifierFlags : 0 /* None */);
                             break;
-                        case 256 /* NamespaceExportDeclaration */:
+                        case 259 /* NamespaceExportDeclaration */:
                             // export as namespace foo
                             // TODO: Not part of a file's local or export symbol tables
                             // Is bound into file.symbol.globalExports instead, which we don't currently traverse
                             addResult(ts.factory.createNamespaceExportDeclaration(ts.idText(node.name)), 0 /* None */);
                             break;
-                        case 259 /* ImportClause */:
+                        case 262 /* ImportClause */:
                             addResult(ts.factory.createImportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, ts.factory.createIdentifier(localName), /*namedBindings*/ undefined), 
@@ -48270,18 +49532,18 @@ var ts;
                             // In such cases, the `target` refers to the module itself already
                             ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */);
                             break;
-                        case 260 /* NamespaceImport */:
+                        case 263 /* NamespaceImport */:
                             addResult(ts.factory.createImportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*importClause*/ undefined, ts.factory.createNamespaceImport(ts.factory.createIdentifier(localName))), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */);
                             break;
-                        case 266 /* NamespaceExport */:
+                        case 269 /* NamespaceExport */:
                             addResult(ts.factory.createExportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, 
                             /*isTypeOnly*/ false, ts.factory.createNamespaceExport(ts.factory.createIdentifier(localName)), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */);
                             break;
-                        case 262 /* ImportSpecifier */:
+                        case 265 /* ImportSpecifier */:
                             addResult(ts.factory.createImportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createImportClause(
@@ -48290,7 +49552,7 @@ var ts;
                                 ts.factory.createImportSpecifier(localName !== verbatimTargetName ? ts.factory.createIdentifier(verbatimTargetName) : undefined, ts.factory.createIdentifier(localName))
                             ])), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */);
                             break;
-                        case 267 /* ExportSpecifier */:
+                        case 270 /* ExportSpecifier */:
                             // does not use localName because the symbol name in this case refers to the name in the exports table,
                             // which we must exactly preserve
                             var specifier = node.parent.parent.moduleSpecifier;
@@ -48298,11 +49560,12 @@ var ts;
                             // another file
                             serializeExportSpecifier(ts.unescapeLeadingUnderscores(symbol.escapedName), specifier ? verbatimTargetName : targetName, specifier && ts.isStringLiteralLike(specifier) ? ts.factory.createStringLiteral(specifier.text) : undefined);
                             break;
-                        case 263 /* ExportAssignment */:
+                        case 266 /* ExportAssignment */:
                             serializeMaybeAliasAssignment(symbol);
                             break;
-                        case 213 /* BinaryExpression */:
-                        case 198 /* PropertyAccessExpression */:
+                        case 216 /* BinaryExpression */:
+                        case 201 /* PropertyAccessExpression */:
+                        case 202 /* ElementAccessExpression */:
                             // Could be best encoded as though an export specifier or as though an export assignment
                             // If name is default or export=, do an export assignment
                             // Otherwise do an export specifier
@@ -48333,7 +49596,7 @@ var ts;
                     var name = ts.unescapeLeadingUnderscores(symbol.escapedName);
                     var isExportEquals = name === "export=" /* ExportEquals */;
                     var isDefault = name === "default" /* Default */;
-                    var isExportAssignment = isExportEquals || isDefault;
+                    var isExportAssignmentCompatibleSymbolName = isExportEquals || isDefault;
                     // synthesize export = ref
                     // ref should refer to either be a locally scoped symbol which we need to emit, or
                     // a reference to another namespace/module which we may need to emit an `import` statement for
@@ -48345,8 +49608,8 @@ var ts;
                         // In case `target` refers to a namespace member, look at the declaration and serialize the leftmost symbol in it
                         // eg, `namespace A { export class B {} }; exports = A.B;`
                         // Technically, this is all that's required in the case where the assignment is an entity name expression
-                        var expr = isExportAssignment ? ts.getExportAssignmentExpression(aliasDecl) : ts.getPropertyAssignmentAliasLikeExpression(aliasDecl);
-                        var first_1 = ts.isEntityNameExpression(expr) ? getFirstNonModuleExportsIdentifier(expr) : undefined;
+                        var expr = aliasDecl && ((ts.isExportAssignment(aliasDecl) || ts.isBinaryExpression(aliasDecl)) ? ts.getExportAssignmentExpression(aliasDecl) : ts.getPropertyAssignmentAliasLikeExpression(aliasDecl));
+                        var first_1 = expr && ts.isEntityNameExpression(expr) ? getFirstNonModuleExportsIdentifier(expr) : undefined;
                         var referenced = first_1 && resolveEntityName(first_1, 67108863 /* All */, /*ignoreErrors*/ true, /*dontResolveAlias*/ true, enclosingDeclaration);
                         if (referenced || target) {
                             includePrivateSymbol(referenced || target);
@@ -48358,17 +49621,17 @@ var ts;
                         // into the containing scope anyway, so we want to skip the visibility checks.
                         var oldTrack = context.tracker.trackSymbol;
                         context.tracker.trackSymbol = ts.noop;
-                        if (isExportAssignment) {
+                        if (isExportAssignmentCompatibleSymbolName) {
                             results.push(ts.factory.createExportAssignment(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, isExportEquals, symbolToExpression(target, context, 67108863 /* All */)));
                         }
                         else {
-                            if (first_1 === expr) {
+                            if (first_1 === expr && first_1) {
                                 // serialize as `export {target as name}`
                                 serializeExportSpecifier(name, ts.idText(first_1));
                             }
-                            else if (ts.isClassExpression(expr)) {
+                            else if (expr && ts.isClassExpression(expr)) {
                                 serializeExportSpecifier(name, getInternalSymbolName(target, ts.symbolName(target)));
                             }
                             else {
@@ -48391,15 +49654,19 @@ var ts;
                         var typeToSerialize = getWidenedType(getTypeOfSymbol(getMergedSymbol(symbol)));
                         if (isTypeRepresentableAsFunctionNamespaceMerge(typeToSerialize, symbol)) {
                             // If there are no index signatures and `typeToSerialize` is an object type, emit as a namespace instead of a const
-                            serializeAsFunctionNamespaceMerge(typeToSerialize, symbol, varName, isExportAssignment ? 0 /* None */ : 1 /* Export */);
+                            serializeAsFunctionNamespaceMerge(typeToSerialize, symbol, varName, isExportAssignmentCompatibleSymbolName ? 0 /* None */ : 1 /* Export */);
                         }
                         else {
                             var statement = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([
                                 ts.factory.createVariableDeclaration(varName, /*exclamationToken*/ undefined, serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled))
                             ], 2 /* Const */));
-                            addResult(statement, name === varName ? 1 /* Export */ : 0 /* None */);
+                            // Inlined JSON types exported with [module.]exports= will already emit an export=, so should use `declare`.
+                            // Otherwise, the type itself should be exported.
+                            addResult(statement, target && target.flags & 4 /* Property */ && target.escapedName === "export=" /* ExportEquals */ ? 2 /* Ambient */
+                                : name === varName ? 1 /* Export */
+                                    : 0 /* None */);
                         }
-                        if (isExportAssignment) {
+                        if (isExportAssignmentCompatibleSymbolName) {
                             results.push(ts.factory.createExportAssignment(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, isExportEquals, ts.factory.createIdentifier(varName)));
@@ -48420,7 +49687,8 @@ var ts;
                     return ts.getObjectFlags(typeToSerialize) & (16 /* Anonymous */ | 32 /* Mapped */) &&
                         !getIndexInfoOfType(typeToSerialize, 0 /* String */) &&
                         !getIndexInfoOfType(typeToSerialize, 1 /* Number */) &&
-                        !!(ts.length(getPropertiesOfType(typeToSerialize)) || ts.length(getSignaturesOfType(typeToSerialize, 0 /* Call */))) &&
+                        !isClassInstanceSide(typeToSerialize) && // While a class instance is potentially representable as a NS, prefer printing a reference to the instance type and serializing the class
+                        !!(ts.length(ts.filter(getPropertiesOfType(typeToSerialize), isNamespaceMember)) || ts.length(getSignaturesOfType(typeToSerialize, 0 /* Call */))) &&
                         !ts.length(getSignaturesOfType(typeToSerialize, 1 /* Construct */)) && // TODO: could probably serialize as function + ns + class, now that that's OK
                         !getDeclarationWithTypeAnnotation(hostSymbol, enclosingDeclaration) &&
                         !(typeToSerialize.symbol && ts.some(typeToSerialize.symbol.declarations, function (d) { return ts.getSourceFileOfNode(d) !== ctxSrc; })) &&
@@ -48468,7 +49736,7 @@ var ts;
                         }
                         // This is an else/if as accessors and properties can't merge in TS, but might in JS
                         // If this happens, we assume the accessor takes priority, as it imposes more constraints
-                        else if (p.flags & (4 /* Property */ | 3 /* Variable */)) {
+                        else if (p.flags & (4 /* Property */ | 3 /* Variable */ | 98304 /* Accessor */)) {
                             return ts.setTextRange(createProperty(
                             /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags((isReadonlySymbol(p) ? 64 /* Readonly */ : 0) | flag), name, p.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined, isPrivate ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), 
                             // TODO: https://github.com/microsoft/TypeScript/pull/32372#discussion_r328386357
@@ -48711,7 +49979,7 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
                 var node = ts.walkUpParenthesizedTypes(type.symbol.declarations[0].parent);
-                if (node.kind === 251 /* TypeAliasDeclaration */) {
+                if (node.kind === 254 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -48719,11 +49987,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 254 /* ModuleBlock */ &&
+                node.parent.kind === 257 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 294 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 297 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = getSymbolLinks(symbol).nameType;
@@ -48782,17 +50050,17 @@ var ts;
                 if (!declaration) {
                     declaration = symbol.declarations[0]; // Declaration may be nameless, but we'll try anyway
                 }
-                if (declaration.parent && declaration.parent.kind === 246 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 249 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 218 /* ClassExpression */:
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
+                    case 221 /* ClassExpression */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 218 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 221 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -48809,28 +50077,28 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 320 /* JSDocCallbackTag */:
-                    case 327 /* JSDocTypedefTag */:
-                    case 321 /* JSDocEnumTag */:
+                    case 324 /* JSDocCallbackTag */:
+                    case 331 /* JSDocTypedefTag */:
+                    case 325 /* JSDocEnumTag */:
                         // 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 195 /* BindingElement */:
+                    case 198 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 246 /* VariableDeclaration */:
+                    case 249 /* 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 253 /* ModuleDeclaration */:
-                    case 249 /* ClassDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 248 /* FunctionDeclaration */:
-                    case 252 /* EnumDeclaration */:
-                    case 257 /* ImportEqualsDeclaration */:
+                    case 256 /* ModuleDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 251 /* FunctionDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -48838,55 +50106,55 @@ 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 !== 257 /* ImportEqualsDeclaration */ && parent.kind !== 294 /* SourceFile */ && parent.flags & 8388608 /* Ambient */)) {
+                            !(node.kind !== 260 /* ImportEqualsDeclaration */ && parent.kind !== 297 /* SourceFile */ && parent.flags & 8388608 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 162 /* PropertyDeclaration */:
-                    case 161 /* PropertySignature */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
+                    case 163 /* PropertyDeclaration */:
+                    case 162 /* PropertySignature */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
                         if (ts.hasEffectiveModifier(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 165 /* Constructor */:
-                    case 169 /* ConstructSignature */:
-                    case 168 /* CallSignature */:
-                    case 170 /* IndexSignature */:
-                    case 159 /* Parameter */:
-                    case 254 /* ModuleBlock */:
-                    case 173 /* FunctionType */:
-                    case 174 /* ConstructorType */:
-                    case 176 /* TypeLiteral */:
-                    case 172 /* TypeReference */:
-                    case 177 /* ArrayType */:
-                    case 178 /* TupleType */:
-                    case 181 /* UnionType */:
-                    case 182 /* IntersectionType */:
-                    case 185 /* ParenthesizedType */:
-                    case 191 /* NamedTupleMember */:
+                    case 166 /* Constructor */:
+                    case 170 /* ConstructSignature */:
+                    case 169 /* CallSignature */:
+                    case 171 /* IndexSignature */:
+                    case 160 /* Parameter */:
+                    case 257 /* ModuleBlock */:
+                    case 174 /* FunctionType */:
+                    case 175 /* ConstructorType */:
+                    case 177 /* TypeLiteral */:
+                    case 173 /* TypeReference */:
+                    case 178 /* ArrayType */:
+                    case 179 /* TupleType */:
+                    case 182 /* UnionType */:
+                    case 183 /* IntersectionType */:
+                    case 186 /* ParenthesizedType */:
+                    case 192 /* NamedTupleMember */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 259 /* ImportClause */:
-                    case 260 /* NamespaceImport */:
-                    case 262 /* ImportSpecifier */:
+                    case 262 /* ImportClause */:
+                    case 263 /* NamespaceImport */:
+                    case 265 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 158 /* TypeParameter */:
+                    case 159 /* TypeParameter */:
                     // Source file and namespace export are always visible
                     // falls through
-                    case 294 /* SourceFile */:
-                    case 256 /* NamespaceExportDeclaration */:
+                    case 297 /* SourceFile */:
+                    case 259 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 263 /* ExportAssignment */:
+                    case 266 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -48895,10 +50163,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 263 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 266 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 267 /* ExportSpecifier */) {
+            else if (node.parent.kind === 270 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -49003,12 +50271,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 246 /* VariableDeclaration */:
-                    case 247 /* VariableDeclarationList */:
-                    case 262 /* ImportSpecifier */:
-                    case 261 /* NamedImports */:
-                    case 260 /* NamespaceImport */:
-                    case 259 /* ImportClause */:
+                    case 249 /* VariableDeclaration */:
+                    case 250 /* VariableDeclarationList */:
+                    case 265 /* ImportSpecifier */:
+                    case 264 /* NamedImports */:
+                    case 263 /* NamespaceImport */:
+                    case 262 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -49093,9 +50361,13 @@ var ts;
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
                     var literal = ts.setTextRange(ts.parseNodeFactory.createStringLiteral(propName), node);
-                    var result = ts.setTextRange(ts.parseNodeFactory.createElementAccessExpression(parentAccess, literal), node);
+                    var lhsExpr = ts.isLeftHandSideExpression(parentAccess) ? parentAccess : ts.parseNodeFactory.createParenthesizedExpression(parentAccess);
+                    var result = ts.setTextRange(ts.parseNodeFactory.createElementAccessExpression(lhsExpr, literal), node);
                     ts.setParent(literal, result);
                     ts.setParent(result, node);
+                    if (lhsExpr !== parentAccess) {
+                        ts.setParent(lhsExpr, result);
+                    }
                     result.flowNode = parentAccess.flowNode;
                     return result;
                 }
@@ -49104,23 +50376,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 195 /* BindingElement */:
-                case 285 /* PropertyAssignment */:
+                case 198 /* BindingElement */:
+                case 288 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 195 /* BindingElement */ && parent.kind === 193 /* ObjectBindingPattern */) {
+            if (node.kind === 198 /* BindingElement */ && parent.kind === 196 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 285 /* PropertyAssignment */ || node.kind === 286 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 288 /* PropertyAssignment */ || node.kind === 289 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -49146,7 +50418,7 @@ var ts;
                 parentType = getTypeWithFacts(parentType, 524288 /* NEUndefined */);
             }
             var type;
-            if (pattern.kind === 193 /* ObjectBindingPattern */) {
+            if (pattern.kind === 196 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     parentType = getReducedType(parentType);
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
@@ -49166,7 +50438,7 @@ var ts;
                     // 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);
+                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, name, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, 16 /* ExpressionPosition */), declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
             }
@@ -49174,7 +50446,7 @@ var ts;
                 // 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(65 /* Destructuring */, parentType, undefinedType, pattern);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */ | (declaration.dotDotDotToken ? 0 : 128 /* PossiblyOutOfBounds */), parentType, undefinedType, pattern);
                 var index_2 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -49187,7 +50459,7 @@ var ts;
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_2);
                     var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
-                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, declaration.name, accessFlags | 16 /* ExpressionPosition */) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
@@ -49219,7 +50491,7 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 196 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 199 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
@@ -49229,11 +50501,11 @@ var ts;
         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 === 235 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 238 /* 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 === 236 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 239 /* 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,
@@ -49270,8 +50542,8 @@ var ts;
             if (ts.isParameter(declaration)) {
                 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 === 167 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 166 /* GetAccessor */);
+                if (func.kind === 168 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 167 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -49338,10 +50610,11 @@ var ts;
             if (symbol.valueDeclaration && ts.isBinaryExpression(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isConstructorDeclaredProperty === undefined) {
+                    links.isConstructorDeclaredProperty = false;
                     links.isConstructorDeclaredProperty = !!getDeclaringConstructor(symbol) && ts.every(symbol.declarations, function (declaration) {
                         return ts.isBinaryExpression(declaration) &&
-                            ts.getAssignmentDeclarationKind(declaration) === 4 /* ThisProperty */ &&
-                            (declaration.left.kind !== 199 /* ElementAccessExpression */ || ts.isStringOrNumericLiteralLike(declaration.left.argumentExpression)) &&
+                            isPossiblyAliasedThisProperty(declaration) &&
+                            (declaration.left.kind !== 202 /* ElementAccessExpression */ || ts.isStringOrNumericLiteralLike(declaration.left.argumentExpression)) &&
                             !getAnnotatedTypeForAssignmentDeclaration(/*declaredType*/ undefined, declaration, symbol, declaration);
                     });
                 }
@@ -49360,13 +50633,16 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 var container = ts.getThisContainer(declaration, /*includeArrowFunctions*/ false);
-                if (container && (container.kind === 165 /* Constructor */ || isJSConstructor(container))) {
+                if (container && (container.kind === 166 /* Constructor */ || isJSConstructor(container))) {
                     return container;
                 }
             }
         }
         function getFlowTypeInConstructor(symbol, constructor) {
-            var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), ts.unescapeLeadingUnderscores(symbol.escapedName));
+            var accessName = ts.startsWith(symbol.escapedName, "__#")
+                ? ts.factory.createPrivateIdentifier(symbol.escapedName.split("@")[1])
+                : ts.unescapeLeadingUnderscores(symbol.escapedName);
+            var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), accessName);
             ts.setParent(reference.expression, reference);
             ts.setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
@@ -49414,7 +50690,7 @@ var ts;
                     var kind = ts.isAccessExpression(expression)
                         ? ts.getAssignmentDeclarationPropertyAccessKind(expression)
                         : ts.getAssignmentDeclarationKind(expression);
-                    if (kind === 4 /* ThisProperty */) {
+                    if (kind === 4 /* ThisProperty */ || ts.isBinaryExpression(expression) && isPossiblyAliasedThisProperty(expression, kind)) {
                         if (isDeclarationInConstructor(expression)) {
                             definedInConstructor = true;
                         }
@@ -49531,6 +50807,7 @@ var ts;
                 var exportedType = resolveStructuredTypeMembers(type);
                 var members_4 = ts.createSymbolTable();
                 ts.copyEntries(exportedType.members, members_4);
+                var initialSize = members_4.size;
                 if (resolvedSymbol && !resolvedSymbol.exports) {
                     resolvedSymbol.exports = ts.createSymbolTable();
                 }
@@ -49569,8 +50846,12 @@ var ts;
                         members_4.set(name, s);
                     }
                 });
-                var result = createAnonymousType(exportedType.symbol, members_4, exportedType.callSignatures, exportedType.constructSignatures, exportedType.stringIndexInfo, exportedType.numberIndexInfo);
+                var result = createAnonymousType(initialSize !== members_4.size ? undefined : exportedType.symbol, // Only set the type's symbol if it looks to be the same as the original type
+                members_4, exportedType.callSignatures, exportedType.constructSignatures, exportedType.stringIndexInfo, exportedType.numberIndexInfo);
                 result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Propagate JSLiteral flag
+                if (result.symbol && result.symbol.flags & 32 /* Class */ && type === getDeclaredTypeOfClassOrInterface(result.symbol)) {
+                    result.objectFlags |= 1073741824 /* IsClassInstanceClone */; // Propagate the knowledge that this type is equivalent to the symbol's class instance type
+                }
                 return result;
             }
             if (isEmptyArrayLiteralType(type)) {
@@ -49588,9 +50869,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 === 165 /* Constructor */ ||
-                thisContainer.kind === 248 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 205 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 166 /* Constructor */ ||
+                thisContainer.kind === 251 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 208 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -49660,7 +50941,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var restElement = lastElement && lastElement.kind === 195 /* BindingElement */ && lastElement.dotDotDotToken ? lastElement : undefined;
+            var restElement = lastElement && lastElement.kind === 198 /* BindingElement */ && lastElement.dotDotDotToken ? lastElement : undefined;
             if (elements.length === 0 || elements.length === 1 && restElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -49685,7 +50966,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 193 /* ObjectBindingPattern */
+            return pattern.kind === 196 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -49724,7 +51005,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 159 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 160 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -49787,7 +51068,7 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (declaration.kind === 263 /* ExportAssignment */) {
+            if (declaration.kind === 266 /* ExportAssignment */) {
                 type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
             }
             else if (ts.isBinaryExpression(declaration) ||
@@ -49858,7 +51139,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 166 /* GetAccessor */) {
+                if (accessor.kind === 167 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -49892,15 +51173,15 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter = ts.getDeclarationOfKind(symbol, 166 /* GetAccessor */);
+                    var getter = ts.getDeclarationOfKind(symbol, 167 /* GetAccessor */);
                     error(getter, 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 resolveTypeOfAccessors(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 166 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 167 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 167 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 168 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -49951,9 +51232,9 @@ var ts;
             var links = getSymbolLinks(symbol);
             var originalLinks = links;
             if (!links.type) {
-                var jsDeclaration = symbol.valueDeclaration && ts.getDeclarationOfExpando(symbol.valueDeclaration);
-                if (jsDeclaration) {
-                    var merged = mergeJSSymbols(symbol, getSymbolOfNode(jsDeclaration));
+                var expando = symbol.valueDeclaration && getSymbolOfExpando(symbol.valueDeclaration, /*allowDeclaration*/ false);
+                if (expando) {
+                    var merged = mergeJSSymbols(symbol, expando);
                     if (merged) {
                         // note:we overwrite links because we just cloned the symbol
                         symbol = links = merged;
@@ -49968,9 +51249,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration && (declaration.kind === 213 /* BinaryExpression */ ||
+            else if (declaration && (declaration.kind === 216 /* BinaryExpression */ ||
                 ts.isAccessExpression(declaration) &&
-                    declaration.parent.kind === 213 /* BinaryExpression */)) {
+                    declaration.parent.kind === 216 /* BinaryExpression */)) {
                 return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
@@ -50037,7 +51318,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 159 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 160 /* 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
@@ -50136,43 +51417,43 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 229 /* VariableStatement */:
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 168 /* CallSignature */:
-                    case 169 /* ConstructSignature */:
-                    case 163 /* MethodSignature */:
-                    case 173 /* FunctionType */:
-                    case 174 /* ConstructorType */:
-                    case 304 /* JSDocFunctionType */:
-                    case 248 /* FunctionDeclaration */:
-                    case 164 /* MethodDeclaration */:
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 326 /* JSDocTemplateTag */:
-                    case 327 /* JSDocTypedefTag */:
-                    case 321 /* JSDocEnumTag */:
-                    case 320 /* JSDocCallbackTag */:
-                    case 189 /* MappedType */:
-                    case 183 /* ConditionalType */:
+                    case 232 /* VariableStatement */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 169 /* CallSignature */:
+                    case 170 /* ConstructSignature */:
+                    case 164 /* MethodSignature */:
+                    case 174 /* FunctionType */:
+                    case 175 /* ConstructorType */:
+                    case 308 /* JSDocFunctionType */:
+                    case 251 /* FunctionDeclaration */:
+                    case 165 /* MethodDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 330 /* JSDocTemplateTag */:
+                    case 331 /* JSDocTypedefTag */:
+                    case 325 /* JSDocEnumTag */:
+                    case 324 /* JSDocCallbackTag */:
+                    case 190 /* MappedType */:
+                    case 184 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 189 /* MappedType */) {
+                        if (node.kind === 190 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 183 /* ConditionalType */) {
+                        else if (node.kind === 184 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
-                        else if (node.kind === 229 /* VariableStatement */ && !ts.isInJSFile(node)) {
+                        else if (node.kind === 232 /* VariableStatement */ && !ts.isInJSFile(node)) {
                             break;
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */ || node.kind === 250 /* InterfaceDeclaration */ || isJSConstructor(node)) &&
+                            (node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */ || node.kind === 253 /* InterfaceDeclaration */ || isJSConstructor(node)) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
-                    case 322 /* JSDocParameterTag */:
+                    case 326 /* JSDocParameterTag */:
                         var paramSymbol = ts.getParameterSymbolFromJSDoc(node);
                         if (paramSymbol) {
                             node = paramSymbol.valueDeclaration;
@@ -50183,7 +51464,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, 250 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 253 /* InterfaceDeclaration */);
             ts.Debug.assert(!!declaration, "Class was missing valueDeclaration -OR- non-class had no interface declarations");
             return getOuterTypeParameters(declaration);
         }
@@ -50193,9 +51474,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 250 /* InterfaceDeclaration */ ||
-                    node.kind === 249 /* ClassDeclaration */ ||
-                    node.kind === 218 /* ClassExpression */ ||
+                if (node.kind === 253 /* InterfaceDeclaration */ ||
+                    node.kind === 252 /* ClassDeclaration */ ||
+                    node.kind === 221 /* ClassExpression */ ||
                     isJSConstructor(node) ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
@@ -50339,7 +51620,7 @@ var ts;
                     if (!popTypeResolution()) {
                         for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (declaration.kind === 249 /* ClassDeclaration */ || declaration.kind === 250 /* InterfaceDeclaration */) {
+                            if (declaration.kind === 252 /* ClassDeclaration */ || declaration.kind === 253 /* InterfaceDeclaration */) {
                                 reportCircularBaseType(declaration, type);
                             }
                         }
@@ -50434,7 +51715,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 === 250 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 253 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getReducedType(getTypeFromTypeNode(node));
@@ -50470,7 +51751,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 250 /* InterfaceDeclaration */) {
+                if (declaration.kind === 253 /* InterfaceDeclaration */) {
                     if (declaration.flags & 128 /* ContainsThis */) {
                         return false;
                     }
@@ -50558,7 +51839,7 @@ var ts;
             if (ts.isStringLiteralLike(expr)) {
                 return true;
             }
-            else if (expr.kind === 213 /* BinaryExpression */) {
+            else if (expr.kind === 216 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -50573,12 +51854,12 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return true;
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return expr.operator === 40 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
                 case 78 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -50592,7 +51873,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 252 /* EnumDeclaration */) {
+                if (declaration.kind === 255 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && ts.isStringLiteralLike(member.initializer)) {
@@ -50619,7 +51900,7 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 252 /* EnumDeclaration */) {
+                    if (declaration.kind === 255 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
                             var value = getEnumMemberValue(member);
@@ -50692,21 +51973,21 @@ var ts;
         function isThislessType(node) {
             switch (node.kind) {
                 case 128 /* AnyKeyword */:
-                case 151 /* UnknownKeyword */:
-                case 146 /* StringKeyword */:
-                case 143 /* NumberKeyword */:
-                case 154 /* BigIntKeyword */:
+                case 152 /* UnknownKeyword */:
+                case 147 /* StringKeyword */:
+                case 144 /* NumberKeyword */:
+                case 155 /* BigIntKeyword */:
                 case 131 /* BooleanKeyword */:
-                case 147 /* SymbolKeyword */:
-                case 144 /* ObjectKeyword */:
+                case 148 /* SymbolKeyword */:
+                case 145 /* ObjectKeyword */:
                 case 113 /* VoidKeyword */:
-                case 149 /* UndefinedKeyword */:
-                case 140 /* NeverKeyword */:
-                case 190 /* LiteralType */:
+                case 150 /* UndefinedKeyword */:
+                case 141 /* NeverKeyword */:
+                case 191 /* LiteralType */:
                     return true;
-                case 177 /* ArrayType */:
+                case 178 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -50732,7 +52013,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 165 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 166 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -50748,14 +52029,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 162 /* PropertyDeclaration */:
-                        case 161 /* PropertySignature */:
+                        case 163 /* PropertyDeclaration */:
+                        case 162 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 164 /* MethodDeclaration */:
-                        case 163 /* MethodSignature */:
-                        case 165 /* Constructor */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
+                        case 165 /* MethodDeclaration */:
+                        case 164 /* MethodSignature */:
+                        case 166 /* Constructor */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -50960,7 +52241,7 @@ var ts;
                 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++) {
+                for (var _i = 0, _a = symbol.declarations || ts.emptyArray; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     var members = ts.getMembersOfDeclaration(decl);
                     if (members) {
@@ -50979,7 +52260,7 @@ var ts;
                         var member = decls_1[_c];
                         var assignmentKind = ts.getAssignmentDeclarationKind(member);
                         var isInstanceMember = assignmentKind === 3 /* PrototypeProperty */
-                            || assignmentKind === 4 /* ThisProperty */
+                            || ts.isBinaryExpression(member) && isPossiblyAliasedThisProperty(member, assignmentKind)
                             || assignmentKind === 9 /* ObjectDefinePrototypeProperty */
                             || assignmentKind === 6 /* Prototype */; // A straight `Prototype` assignment probably can never have a computed name
                         if (isStatic === !isInstanceMember && hasLateBindableName(member)) {
@@ -51102,6 +52383,7 @@ var ts;
             sig.resolvedReturnType = resolvedReturnType;
             sig.resolvedTypePredicate = resolvedTypePredicate;
             sig.minArgumentCount = minArgumentCount;
+            sig.resolvedMinArgumentCount = undefined;
             sig.target = undefined;
             sig.mapper = undefined;
             sig.unionSignatures = undefined;
@@ -51345,8 +52627,8 @@ var ts;
         function getUnionIndexInfo(types, kind) {
             var indexTypes = [];
             var isAnyReadonly = false;
-            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
-                var type = types_3[_i];
+            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                var type = types_4[_i];
                 var indexInfo = getIndexInfoOfType(getApparentType(type), kind);
                 if (!indexInfo) {
                     return undefined;
@@ -51545,9 +52827,6 @@ var ts;
         // 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 */) {
                 var t = getApparentType(type.type);
                 return isGenericTupleType(t) ? getKnownKeysOfTupleType(t) : getIndexType(t);
@@ -51568,7 +52847,7 @@ var ts;
             if (type.flags & 2097152 /* Intersection */) {
                 return getIntersectionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
             }
-            return neverType;
+            return type;
         }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
@@ -51581,6 +52860,7 @@ var ts;
             // and T as the template type.
             var typeParameter = getTypeParameterFromMappedType(type);
             var constraintType = getConstraintTypeFromMappedType(type);
+            var nameType = getNameTypeFromMappedType(type.target || type);
             var templateType = getTemplateTypeFromMappedType(type.target || type);
             var modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T'
             var templateModifiers = getMappedTypeModifiers(type);
@@ -51602,25 +52882,25 @@ var ts;
                 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 = appendTypeMapping(type.mapper, typeParameter, t);
+            function addMemberForKeyType(keyType) {
+                var propNameType = nameType ? instantiateType(nameType, appendTypeMapping(type.mapper, typeParameter, keyType)) : keyType;
+                forEachType(propNameType, function (t) { return addMemberForKeyTypeWorker(keyType, t); });
+            }
+            function addMemberForKeyTypeWorker(keyType, propNameType) {
                 // 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);
+                if (isTypeUsableAsPropertyName(propNameType)) {
+                    var propName = getPropertyNameFromType(propNameType);
                     // String enum members from separate enums with identical values
                     // are distinct types with the same property name. Make the resulting
                     // property symbol's name type be the union of those enum member types.
                     var existingProp = members.get(propName);
                     if (existingProp) {
-                        existingProp.nameType = getUnionType([existingProp.nameType, t]);
-                        existingProp.mapper = appendTypeMapping(type.mapper, typeParameter, existingProp.nameType);
+                        existingProp.nameType = getUnionType([existingProp.nameType, propNameType]);
+                        existingProp.keyType = getUnionType([existingProp.keyType, keyType]);
                     }
                     else {
-                        var modifiersProp = getPropertyOfType(modifiersType, propName);
+                        var modifiersProp = isTypeUsableAsPropertyName(keyType) ? getPropertyOfType(modifiersType, getPropertyNameFromType(keyType)) : undefined;
                         var isOptional = !!(templateModifiers & 4 /* IncludeOptional */ ||
                             !(templateModifiers & 8 /* ExcludeOptional */) && modifiersProp && modifiersProp.flags & 16777216 /* Optional */);
                         var isReadonly = !!(templateModifiers & 1 /* IncludeReadonly */ ||
@@ -51628,19 +52908,19 @@ var ts;
                         var stripOptional = strictNullChecks && !isOptional && modifiersProp && modifiersProp.flags & 16777216 /* Optional */;
                         var prop = createSymbol(4 /* Property */ | (isOptional ? 16777216 /* Optional */ : 0), propName, 262144 /* Mapped */ | (isReadonly ? 8 /* Readonly */ : 0) | (stripOptional ? 524288 /* StripOptional */ : 0));
                         prop.mappedType = type;
+                        prop.nameType = propNameType;
+                        prop.keyType = keyType;
                         if (modifiersProp) {
                             prop.syntheticOrigin = modifiersProp;
                             prop.declarations = modifiersProp.declarations;
                         }
-                        prop.nameType = t;
-                        prop.mapper = templateMapper;
                         members.set(propName, prop);
                     }
                 }
-                else if (t.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 32 /* Enum */)) {
-                    var propType = instantiateType(templateType, templateMapper);
-                    if (t.flags & (1 /* Any */ | 4 /* String */)) {
-                        stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (propNameType.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 32 /* Enum */)) {
+                    var propType = instantiateType(templateType, appendTypeMapping(type.mapper, typeParameter, keyType));
+                    if (propNameType.flags & (1 /* Any */ | 4 /* String */)) {
+                        stringIndexInfo = createIndexInfo(stringIndexInfo ? getUnionType([stringIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                     }
                     else {
                         numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
@@ -51650,12 +52930,14 @@ var ts;
         }
         function getTypeOfMappedSymbol(symbol) {
             if (!symbol.type) {
+                var mappedType = symbol.mappedType;
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                    symbol.mappedType.containsError = true;
+                    mappedType.containsError = true;
                     return errorType;
                 }
-                var templateType = getTemplateTypeFromMappedType(symbol.mappedType.target || symbol.mappedType);
-                var propType = instantiateType(templateType, symbol.mapper);
+                var templateType = getTemplateTypeFromMappedType(mappedType.target || mappedType);
+                var mapper = appendTypeMapping(mappedType.mapper, getTypeParameterFromMappedType(mappedType), symbol.keyType);
+                var propType = instantiateType(templateType, mapper);
                 // 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.
@@ -51663,11 +52945,10 @@ var ts;
                     symbol.checkFlags & 524288 /* StripOptional */ ? getTypeWithFacts(propType, 524288 /* NEUndefined */) :
                         propType;
                 if (!popTypeResolution()) {
-                    error(currentNode, ts.Diagnostics.Type_of_property_0_circularly_references_itself_in_mapped_type_1, symbolToString(symbol), typeToString(symbol.mappedType));
+                    error(currentNode, ts.Diagnostics.Type_of_property_0_circularly_references_itself_in_mapped_type_1, symbolToString(symbol), typeToString(mappedType));
                     type = errorType;
                 }
                 symbol.type = type;
-                symbol.mapper = undefined;
             }
             return symbol.type;
         }
@@ -51679,6 +52960,11 @@ var ts;
             return type.constraintType ||
                 (type.constraintType = getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)) || errorType);
         }
+        function getNameTypeFromMappedType(type) {
+            return type.declaration.nameType ?
+                type.nameType || (type.nameType = instantiateType(getTypeFromTypeNode(type.declaration.nameType), type.mapper)) :
+                undefined;
+        }
         function getTemplateTypeFromMappedType(type) {
             return type.templateType ||
                 (type.templateType = type.declaration.type ?
@@ -51690,8 +52976,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 187 /* TypeOperator */ &&
-                constraintDeclaration.operator === 137 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 188 /* TypeOperator */ &&
+                constraintDeclaration.operator === 138 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -51825,8 +53111,8 @@ var ts;
                 return getAugmentedPropertiesOfType(unionType);
             }
             var props = ts.createSymbolTable();
-            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
-                var memberType = types_4[_i];
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var memberType = types_5[_i];
                 for (var _a = 0, _b = getAugmentedPropertiesOfType(memberType); _a < _b.length; _a++) {
                     var escapedName = _b[_a].escapedName;
                     if (!props.has(escapedName)) {
@@ -51858,14 +53144,14 @@ var ts;
         function getConstraintFromIndexedAccess(type) {
             var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
             if (indexConstraint && indexConstraint !== type.indexType) {
-                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint, type.noUncheckedIndexedAccessCandidate);
                 if (indexedAccess) {
                     return indexedAccess;
                 }
             }
             var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
             if (objectConstraint && objectConstraint !== type.objectType) {
-                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType, type.noUncheckedIndexedAccessCandidate);
             }
             return undefined;
         }
@@ -51914,9 +53200,9 @@ var ts;
         function getEffectiveConstraintOfIntersection(types, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var t = types_5[_i];
-                if (t.flags & 63176704 /* Instantiable */) {
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var t = types_6[_i];
+                if (t.flags & 465829888 /* 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);
@@ -51930,7 +53216,7 @@ var ts;
                         }
                     }
                 }
-                else if (t.flags & 67238908 /* DisjointDomains */) {
+                else if (t.flags & 469892092 /* DisjointDomains */) {
                     hasDisjointDomainType = true;
                 }
             }
@@ -51940,9 +53226,9 @@ var ts;
                 if (hasDisjointDomainType) {
                     // 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 _a = 0, types_6 = types; _a < types_6.length; _a++) {
-                        var t = types_6[_a];
-                        if (t.flags & 67238908 /* DisjointDomains */) {
+                    for (var _a = 0, types_7 = types; _a < types_7.length; _a++) {
+                        var t = types_7[_a];
+                        if (t.flags & 469892092 /* DisjointDomains */) {
                             constraints = ts.append(constraints, t);
                         }
                     }
@@ -51952,7 +53238,7 @@ var ts;
             return undefined;
         }
         function getBaseConstraintOfType(type) {
-            if (type.flags & (58982400 /* InstantiableNonPrimitive */ | 3145728 /* UnionOrIntersection */)) {
+            if (type.flags & (58982400 /* InstantiableNonPrimitive */ | 3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */)) {
                 var constraint = getResolvedBaseConstraint(type);
                 return constraint !== noConstraintType && constraint !== circularConstraintType ? constraint : undefined;
             }
@@ -51974,9 +53260,12 @@ var ts;
          * circularly references the type variable.
          */
         function getResolvedBaseConstraint(type) {
+            if (type.resolvedBaseConstraint) {
+                return type.resolvedBaseConstraint;
+            }
             var nonTerminating = false;
-            return type.resolvedBaseConstraint ||
-                (type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), type));
+            var stack = [];
+            return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), type);
             function getImmediateBaseConstraint(t) {
                 if (!t.immediateBaseConstraint) {
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -51987,13 +53276,19 @@ var ts;
                         // 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.
+                        ts.tracing.instant("check" /* Check */, "getImmediateBaseConstraint_DepthLimit", { typeId: t.id, originalTypeId: type.id, depth: constraintDepth });
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                         nonTerminating = true;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
-                    constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
-                    constraintDepth--;
+                    var result = void 0;
+                    if (!isDeeplyNestedType(t, stack, stack.length)) {
+                        stack.push(t);
+                        constraintDepth++;
+                        result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
+                        constraintDepth--;
+                        stack.pop();
+                    }
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
                             var errorNode = getConstraintDeclaration(t);
@@ -52027,8 +53322,8 @@ var ts;
                 if (t.flags & 3145728 /* UnionOrIntersection */) {
                     var types = t.types;
                     var baseTypes = [];
-                    for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                        var type_3 = types_7[_i];
+                    for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                        var type_3 = types_8[_i];
                         var baseType = getBaseConstraint(type_3);
                         if (baseType) {
                             baseTypes.push(baseType);
@@ -52041,10 +53336,19 @@ var ts;
                 if (t.flags & 4194304 /* Index */) {
                     return keyofConstraintType;
                 }
+                if (t.flags & 134217728 /* TemplateLiteral */) {
+                    var types = t.types;
+                    var constraints = ts.mapDefined(types, getBaseConstraint);
+                    return constraints.length === types.length ? getTemplateLiteralType(t.texts, constraints) : stringType;
+                }
+                if (t.flags & 268435456 /* StringMapping */) {
+                    var constraint = getBaseConstraint(t.type);
+                    return constraint ? getStringMappingType(t.symbol, constraint) : stringType;
+                }
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, t.noUncheckedIndexedAccessCandidate);
                     return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
@@ -52111,7 +53415,7 @@ var ts;
         }
         function getResolvedApparentTypeOfMappedType(type) {
             var typeVariable = getHomomorphicTypeVariable(type);
-            if (typeVariable) {
+            if (typeVariable && !type.declaration.nameType) {
                 var constraint = getConstraintOfTypeParameter(typeVariable);
                 if (constraint && (isArrayType(constraint) || isTupleType(constraint))) {
                     return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
@@ -52125,10 +53429,10 @@ var ts;
          * type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+            var t = type.flags & 465829888 /* 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 & 402653316 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
                             t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ES2020 */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
@@ -52453,10 +53757,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 === 303 /* JSDocOptionalType */
+            node.type && node.type.kind === 307 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 303 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 307 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -52475,7 +53779,10 @@ var ts;
                 var signature = getSignatureFromDeclaration(node.parent);
                 var parameterIndex = node.parent.parameters.indexOf(node);
                 ts.Debug.assert(parameterIndex >= 0);
-                return parameterIndex >= getMinArgumentCount(signature, /*strongArityForUntypedJS*/ true);
+                // Only consider syntactic or instantiated parameters as optional, not `void` parameters as this function is used
+                // in grammar checks and checking for `void` too early results in parameter types widening too early
+                // and causes some noImplicitAny errors to be lost.
+                return parameterIndex >= getMinArgumentCount(signature, 1 /* StrongArityForUntypedJS */ | 2 /* VoidIsNonOptional */);
             }
             var iife = ts.getImmediatelyInvokedFunctionExpression(node.parent);
             if (iife) {
@@ -52490,7 +53797,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 303 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 307 /* JSDocOptionalType */;
         }
         function createTypePredicate(kind, parameterName, parameterIndex, type) {
             return { kind: kind, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -52572,7 +53879,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 190 /* LiteralType */) {
+                    if (type && type.kind === 191 /* LiteralType */) {
                         flags |= 2 /* HasLiteralTypes */;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -52585,16 +53892,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 === 166 /* GetAccessor */ || declaration.kind === 167 /* SetAccessor */) &&
+                if ((declaration.kind === 167 /* GetAccessor */ || declaration.kind === 168 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */;
+                    var otherKind = declaration.kind === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 165 /* Constructor */ ?
+                var classType = declaration.kind === 166 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -52659,11 +53966,11 @@ var ts;
                 switch (node.kind) {
                     case 78 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 162 /* PropertyDeclaration */:
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                        return node.name.kind === 157 /* ComputedPropertyName */
+                    case 163 /* PropertyDeclaration */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                        return node.name.kind === 158 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -52735,7 +54042,7 @@ var ts;
         function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = node.type && getTypeFromTypeNode(node.type);
-            return parameterName.kind === 186 /* ThisType */ ?
+            return parameterName.kind === 187 /* ThisType */ ?
                 createTypePredicate(node.assertsModifier ? 2 /* AssertsThis */ : 0 /* This */, /*parameterName*/ undefined, /*parameterIndex*/ undefined, type) :
                 createTypePredicate(node.assertsModifier ? 3 /* AssertsIdentifier */ : 1 /* Identifier */, parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
         }
@@ -52778,7 +54085,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 165 /* Constructor */) {
+            if (declaration.kind === 166 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -52788,12 +54095,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 166 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 167 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 167 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 168 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -52883,7 +54190,7 @@ var ts;
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
                 var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
-                var isConstructor = kind === 165 /* Constructor */ || kind === 169 /* ConstructSignature */ || kind === 174 /* ConstructorType */;
+                var isConstructor = kind === 166 /* Constructor */ || kind === 170 /* ConstructSignature */ || kind === 175 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -52897,7 +54204,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 143 /* NumberKeyword */ : 146 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 144 /* NumberKeyword */ : 147 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -52931,17 +54238,17 @@ 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 === 184 /* InferType */) {
+                    if (declaration.parent.kind === 185 /* 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 === 172 /* TypeReference */) {
+                        var _b = ts.walkUpParenthesizedTypesAndGetParentAndChild(declaration.parent.parent), _c = _b[0], childTypeParameter = _c === void 0 ? declaration.parent : _c, grandParent = _b[1];
+                        if (grandParent.kind === 173 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
-                                var index = typeReference.typeArguments.indexOf(declaration.parent);
+                                var index = typeReference.typeArguments.indexOf(childTypeParameter);
                                 if (index < typeParameters.length) {
                                     var declaredConstraint = getConstraintOfTypeParameter(typeParameters[index]);
                                     if (declaredConstraint) {
@@ -52962,11 +54269,16 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter declaration, a rest type
                         // or a named rest tuple element, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 159 /* Parameter */ && grandParent.dotDotDotToken ||
-                            grandParent.kind === 180 /* RestType */ ||
-                            grandParent.kind === 191 /* NamedTupleMember */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 160 /* Parameter */ && grandParent.dotDotDotToken ||
+                            grandParent.kind === 181 /* RestType */ ||
+                            grandParent.kind === 192 /* NamedTupleMember */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
+                        // When an 'infer T' declaration is immediately contained in a string template type, we infer a 'string'
+                        // constraint.
+                        else if (grandParent.kind === 194 /* TemplateLiteralTypeSpan */) {
+                            inferences = ts.append(inferences, stringType);
+                        }
                     }
                 }
             }
@@ -52989,7 +54301,7 @@ var ts;
                         if (type.flags & 1 /* Any */ && type !== errorType) { // Allow errorType to propegate to keep downstream errors suppressed
                             // use keyofConstraintType as the base constraint for mapped type key constraints (unknown isn;t assignable to that, but `any` was),
                             // use unknown otherwise
-                            type = constraintDeclaration.parent.parent.kind === 189 /* MappedType */ ? keyofConstraintType : unknownType;
+                            type = constraintDeclaration.parent.parent.kind === 190 /* MappedType */ ? keyofConstraintType : unknownType;
                         }
                         typeParameter.constraint = type;
                     }
@@ -52998,7 +54310,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 158 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 159 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -53031,8 +54343,8 @@ var ts;
         // 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_8 = types; _i < types_8.length; _i++) {
-                var type = types_8[_i];
+            for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                var type = types_9[_i];
                 if (!(type.flags & excludeKinds)) {
                     result |= ts.getObjectFlags(type);
                 }
@@ -53078,8 +54390,8 @@ var ts;
                 }
                 var node = type.node;
                 var typeArguments = !node ? ts.emptyArray :
-                    node.kind === 172 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) :
-                        node.kind === 177 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] :
+                    node.kind === 173 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) :
+                        node.kind === 178 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] :
                             ts.map(node.elements, getTypeFromTypeNode);
                 if (popTypeResolution()) {
                     type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments;
@@ -53121,7 +54433,7 @@ var ts;
                         return errorType;
                     }
                 }
-                if (node.kind === 172 /* TypeReference */ && isDeferredTypeReferenceNode(node, ts.length(node.typeArguments) !== typeParameters.length)) {
+                if (node.kind === 173 /* TypeReference */ && isDeferredTypeReferenceNode(node, ts.length(node.typeArguments) !== typeParameters.length)) {
                     return createDeferredTypeReference(type, node, /*mapper*/ undefined);
                 }
                 // In a type reference, the outer type parameters of the referenced class or interface are automatically
@@ -53134,6 +54446,9 @@ var ts;
         }
         function getTypeAliasInstantiation(symbol, typeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
+            if (type === intrinsicMarkerType && intrinsicTypeKinds.has(symbol.escapedName) && typeArguments && typeArguments.length === 1) {
+                return getStringMappingType(symbol, typeArguments[0]);
+            }
             var links = getSymbolLinks(symbol);
             var typeParameters = links.typeParameters;
             var id = getTypeListId(typeArguments);
@@ -53166,9 +54481,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return node.typeName;
-                case 220 /* ExpressionWithTypeArguments */:
+                case 223 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -53216,8 +54531,7 @@ var ts;
         }
         /**
          * A JSdoc TypeReference may be to a value, but resolve it as a type anyway.
-         * Note: If the value is imported from commonjs, it should really be an alias,
-         * but this function's special-case code fakes alias resolution as well.
+         * Example: import('./b').ConstructorFunction
          */
         function getTypeFromJSDocValueReference(node, symbol) {
             var links = getNodeLinks(node);
@@ -53225,19 +54539,9 @@ var ts;
                 var valueType = getTypeOfSymbol(symbol);
                 var typeType = valueType;
                 if (symbol.valueDeclaration) {
-                    var decl = ts.getRootDeclaration(symbol.valueDeclaration);
-                    var isRequireAlias = false;
-                    if (ts.isVariableDeclaration(decl) && decl.initializer) {
-                        var expr = decl.initializer;
-                        // skip past entity names, eg `require("x").a.b.c`
-                        while (ts.isPropertyAccessExpression(expr)) {
-                            expr = expr.expression;
-                        }
-                        isRequireAlias = ts.isCallExpression(expr) && ts.isRequireCall(expr, /*requireStringLiteralLikeArgument*/ true) && !!valueType.symbol;
-                    }
-                    var isImportTypeWithQualifier = node.kind === 192 /* ImportType */ && node.qualifier;
+                    var isImportTypeWithQualifier = node.kind === 195 /* ImportType */ && node.qualifier;
                     // valueType might not have a symbol, eg, {import('./b').STRING_LITERAL}
-                    if (valueType.symbol && (isRequireAlias || isImportTypeWithQualifier)) {
+                    if (valueType.symbol && valueType.symbol !== symbol && isImportTypeWithQualifier) {
                         typeType = getTypeReferenceType(node, valueType.symbol);
                     }
                 }
@@ -53261,7 +54565,7 @@ var ts;
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 178 /* TupleType */ && node.elements.length === 1;
+            return node.kind === 179 /* TupleType */ && node.elements.length === 1;
         }
         function getImpliedConstraint(type, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(type, checkNode.elements[0], extendsNode.elements[0]) :
@@ -53270,9 +54574,9 @@ var ts;
         }
         function getConditionalFlowTypeOfType(type, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 307 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 311 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 183 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 184 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(type, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -53283,7 +54587,7 @@ var ts;
             return constraints ? getSubstitutionType(type, getIntersectionType(ts.append(constraints, type))) : type;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 172 /* TypeReference */ || node.kind === 192 /* ImportType */);
+            return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 173 /* TypeReference */ || node.kind === 195 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -53396,9 +54700,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 249 /* ClassDeclaration */:
-                        case 250 /* InterfaceDeclaration */:
-                        case 252 /* EnumDeclaration */:
+                        case 252 /* ClassDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -53519,11 +54823,11 @@ var ts;
         }
         function getTupleElementFlags(node) {
             switch (node.kind) {
-                case 179 /* OptionalType */:
+                case 180 /* OptionalType */:
                     return 2 /* Optional */;
-                case 180 /* RestType */:
+                case 181 /* RestType */:
                     return getRestTypeElementFlags(node);
-                case 191 /* NamedTupleMember */:
+                case 192 /* NamedTupleMember */:
                     return node.questionToken ? 2 /* Optional */ :
                         node.dotDotDotToken ? getRestTypeElementFlags(node) :
                             1 /* Required */;
@@ -53541,14 +54845,14 @@ var ts;
                 return readonly ? globalReadonlyArrayType : globalArrayType;
             }
             var elementFlags = ts.map(node.elements, getTupleElementFlags);
-            var missingName = ts.some(node.elements, function (e) { return e.kind !== 191 /* NamedTupleMember */; });
+            var missingName = ts.some(node.elements, function (e) { return e.kind !== 192 /* NamedTupleMember */; });
             return getTupleTargetType(elementFlags, readonly, /*associatedNames*/ missingName ? undefined : node.elements);
         }
         // Return true if the given type reference node is directly aliased or if it needs to be deferred
         // because it is possibly contained in a circular chain of eagerly resolved types.
         function isDeferredTypeReferenceNode(node, hasDefaultTypeArguments) {
-            return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 177 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) :
-                node.kind === 178 /* TupleType */ ? ts.some(node.elements, mayResolveTypeAlias) :
+            return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 178 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) :
+                node.kind === 179 /* TupleType */ ? ts.some(node.elements, mayResolveTypeAlias) :
                     hasDefaultTypeArguments || ts.some(node.typeArguments, mayResolveTypeAlias));
         }
         // Return true when the given node is transitively contained in type constructs that eagerly
@@ -53557,18 +54861,18 @@ var ts;
         function isResolvedByTypeAlias(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 185 /* ParenthesizedType */:
-                case 191 /* NamedTupleMember */:
-                case 172 /* TypeReference */:
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
-                case 188 /* IndexedAccessType */:
-                case 183 /* ConditionalType */:
-                case 187 /* TypeOperator */:
-                case 177 /* ArrayType */:
-                case 178 /* TupleType */:
+                case 186 /* ParenthesizedType */:
+                case 192 /* NamedTupleMember */:
+                case 173 /* TypeReference */:
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
+                case 189 /* IndexedAccessType */:
+                case 184 /* ConditionalType */:
+                case 188 /* TypeOperator */:
+                case 178 /* ArrayType */:
+                case 179 /* TupleType */:
                     return isResolvedByTypeAlias(parent);
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     return true;
             }
             return false;
@@ -53577,28 +54881,28 @@ var ts;
         // of a type alias.
         function mayResolveTypeAlias(node) {
             switch (node.kind) {
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return isJSDocTypeReference(node) || !!(resolveTypeReferenceName(node.typeName, 788968 /* Type */).flags & 524288 /* TypeAlias */);
-                case 175 /* TypeQuery */:
+                case 176 /* TypeQuery */:
                     return true;
-                case 187 /* TypeOperator */:
-                    return node.operator !== 150 /* UniqueKeyword */ && mayResolveTypeAlias(node.type);
-                case 185 /* ParenthesizedType */:
-                case 179 /* OptionalType */:
-                case 191 /* NamedTupleMember */:
-                case 303 /* JSDocOptionalType */:
-                case 301 /* JSDocNullableType */:
-                case 302 /* JSDocNonNullableType */:
-                case 298 /* JSDocTypeExpression */:
+                case 188 /* TypeOperator */:
+                    return node.operator !== 151 /* UniqueKeyword */ && mayResolveTypeAlias(node.type);
+                case 186 /* ParenthesizedType */:
+                case 180 /* OptionalType */:
+                case 192 /* NamedTupleMember */:
+                case 307 /* JSDocOptionalType */:
+                case 305 /* JSDocNullableType */:
+                case 306 /* JSDocNonNullableType */:
+                case 301 /* JSDocTypeExpression */:
                     return mayResolveTypeAlias(node.type);
-                case 180 /* RestType */:
-                    return node.type.kind !== 177 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType);
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
+                case 181 /* RestType */:
+                    return node.type.kind !== 178 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType);
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
                     return ts.some(node.types, mayResolveTypeAlias);
-                case 188 /* IndexedAccessType */:
+                case 189 /* IndexedAccessType */:
                     return mayResolveTypeAlias(node.objectType) || mayResolveTypeAlias(node.indexType);
-                case 183 /* ConditionalType */:
+                case 184 /* ConditionalType */:
                     return mayResolveTypeAlias(node.checkType) || mayResolveTypeAlias(node.extendsType) ||
                         mayResolveTypeAlias(node.trueType) || mayResolveTypeAlias(node.falseType);
             }
@@ -53611,19 +54915,19 @@ var ts;
                 if (target === emptyGenericType) {
                     links.resolvedType = emptyObjectType;
                 }
-                else if (!(node.kind === 178 /* TupleType */ && ts.some(node.elements, function (e) { return !!(getTupleElementFlags(e) & 8 /* Variadic */); })) && isDeferredTypeReferenceNode(node)) {
-                    links.resolvedType = node.kind === 178 /* TupleType */ && node.elements.length === 0 ? target :
+                else if (!(node.kind === 179 /* TupleType */ && ts.some(node.elements, function (e) { return !!(getTupleElementFlags(e) & 8 /* Variadic */); })) && isDeferredTypeReferenceNode(node)) {
+                    links.resolvedType = node.kind === 179 /* TupleType */ && node.elements.length === 0 ? target :
                         createDeferredTypeReference(target, node, /*mapper*/ undefined);
                 }
                 else {
-                    var elementTypes = node.kind === 177 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elements, getTypeFromTypeNode);
+                    var elementTypes = node.kind === 178 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elements, getTypeFromTypeNode);
                     links.resolvedType = createNormalizedTypeReference(target, elementTypes);
                 }
             }
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 141 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 142 /* ReadonlyKeyword */;
         }
         function createTupleType(elementTypes, elementFlags, readonly, namedMemberDeclarations) {
             if (readonly === void 0) { readonly = false; }
@@ -53720,7 +55024,9 @@ var ts;
             // Transform [A, ...(X | Y | Z)] into [A, ...X] | [A, ...Y] | [A, ...Z]
             var unionIndex = ts.findIndex(elementTypes, function (t, i) { return !!(target.elementFlags[i] & 8 /* Variadic */ && t.flags & (131072 /* Never */ | 1048576 /* Union */)); });
             if (unionIndex >= 0) {
-                return mapType(elementTypes[unionIndex], function (t) { return createNormalizedTupleType(target, ts.replaceElement(elementTypes, unionIndex, t)); });
+                return checkCrossProductUnion(ts.map(elementTypes, function (t, i) { return target.elementFlags[i] & 8 /* Variadic */ ? t : unknownType; })) ?
+                    mapType(elementTypes[unionIndex], function (t) { return createNormalizedTupleType(target, ts.replaceElement(elementTypes, unionIndex, t)); }) :
+                    errorType;
             }
             // If there are no variadic elements with non-generic types, just create a type reference with the same target type.
             var spreadIndex = ts.findIndex(elementTypes, function (t, i) { return !!(target.elementFlags[i] & 8 /* Variadic */) && !(t.flags & 58982400 /* InstantiableNonPrimitive */) && !isGenericMappedType(t); });
@@ -53834,8 +55140,8 @@ var ts;
             }
             // We ignore 'never' types in unions
             if (!(flags & 131072 /* Never */)) {
-                includes |= flags & 71041023 /* IncludesMask */;
-                if (flags & 66846720 /* StructuredOrInstantiable */)
+                includes |= flags & 205258751 /* IncludesMask */;
+                if (flags & 469499904 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 8388608 /* IncludesWildcard */;
@@ -53856,8 +55162,8 @@ var ts;
         // 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_9 = types; _i < types_9.length; _i++) {
-                var type = types_9[_i];
+            for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                var type = types_10[_i];
                 includes = addTypeToUnion(typeSet, includes, type);
             }
             return includes;
@@ -53886,8 +55192,8 @@ var ts;
             while (i > 0) {
                 i--;
                 var source = types[i];
-                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var target = types_10[_i];
+                for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
+                    var target = types_11[_i];
                     if (source !== target) {
                         if (count === 100000) {
                             // After 100000 subtype checks we estimate the remaining amount of work by assuming the
@@ -53897,6 +55203,7 @@ var ts;
                             // caps union types at 5000 unique literal types and 1000 unique object types.
                             var estimatedCount = (count / (len - i)) * len;
                             if (estimatedCount > (primitivesOnly ? 25000000 : 1000000)) {
+                                ts.tracing.instant("check" /* Check */, "removeSubtypes_DepthLimit", { typeIds: types.map(function (t) { return t.id; }) });
                                 error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
                                 return false;
                             }
@@ -53928,6 +55235,22 @@ var ts;
                 }
             }
         }
+        function removeStringLiteralsMatchedByTemplateLiterals(types) {
+            var templates = ts.filter(types, isPatternLiteralType);
+            if (templates.length) {
+                var i = types.length;
+                var _loop_14 = function () {
+                    i--;
+                    var t = types[i];
+                    if (t.flags & 128 /* StringLiteral */ && ts.some(templates, function (template) { return isTypeSubtypeOf(t, template); })) {
+                        ts.orderedRemoveItemAt(types, i);
+                    }
+                };
+                while (i > 0) {
+                    _loop_14();
+                }
+            }
+        }
         // 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
@@ -53954,6 +55277,9 @@ var ts;
                         if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */)) {
                             removeRedundantLiteralTypes(typeSet, includes);
                         }
+                        if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
+                            removeStringLiteralsMatchedByTemplateLiterals(typeSet);
+                        }
                         break;
                     case 2 /* Subtype */:
                         if (!removeSubtypes(typeSet, !(includes & 262144 /* IncludesStructuredOrInstantiable */))) {
@@ -53967,7 +55293,7 @@ var ts;
                             neverType;
                 }
             }
-            var objectFlags = (includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 262144 /* PrimitiveUnion */) |
+            var objectFlags = (includes & 469647395 /* NotPrimitiveUnion */ ? 0 : 262144 /* PrimitiveUnion */) |
                 (includes & 2097152 /* Intersection */ ? 268435456 /* ContainsIntersections */ : 0);
             return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments);
         }
@@ -54059,15 +55385,15 @@ var ts;
                     }
                     typeSet.set(type.id.toString(), type);
                 }
-                includes |= flags & 71041023 /* IncludesMask */;
+                includes |= flags & 205258751 /* IncludesMask */;
             }
             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_11 = types; _i < types_11.length; _i++) {
-                var type = types_11[_i];
+            for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
+                var type = types_12[_i];
                 includes = addTypeToIntersection(typeSet, includes, getRegularTypeOfLiteralType(type));
             }
             return includes;
@@ -54105,6 +55431,31 @@ var ts;
             }
             return true;
         }
+        /**
+         * Returns `true` if the intersection of the template literals and string literals is the empty set, eg `get${string}` & "setX", and should reduce to `never`
+         */
+        function extractRedundantTemplateLiterals(types) {
+            var i = types.length;
+            var literals = ts.filter(types, function (t) { return !!(t.flags & 128 /* StringLiteral */); });
+            while (i > 0) {
+                i--;
+                var t = types[i];
+                if (!(t.flags & 134217728 /* TemplateLiteral */))
+                    continue;
+                for (var _i = 0, literals_1 = literals; _i < literals_1.length; _i++) {
+                    var t2 = literals_1[_i];
+                    if (isTypeSubtypeOf(t2, t)) {
+                        // eg, ``get${T}` & "getX"` is just `"getX"`
+                        ts.orderedRemoveItemAt(types, i);
+                        break;
+                    }
+                    else if (isPatternLiteralType(t)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
         function extractIrreducible(types, flag) {
             if (ts.every(types, function (t) { return !!(t.flags & 1048576 /* Union */) && ts.some(t.types, function (tt) { return !!(tt.flags & flag); }); })) {
                 for (var i = 0; i < types.length; i++) {
@@ -54193,12 +55544,15 @@ var ts;
             // a non-primitive type and a type known to be primitive.
             if (includes & 131072 /* Never */ ||
                 strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 16777216 /* IncludesEmptyObject */) ||
-                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
+                includes & 67108864 /* NonPrimitive */ && includes & (469892092 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 402653316 /* StringLike */ && includes & (469892092 /* DisjointDomains */ & ~402653316 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (469892092 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (469892092 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (469892092 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (469892092 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
+                return neverType;
+            }
+            if (includes & 134217728 /* TemplateLiteral */ && includes & 128 /* StringLiteral */ && extractRedundantTemplateLiterals(typeSet)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -54242,9 +55596,7 @@ var ts;
                         // 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);
+                        if (!checkCrossProductUnion(typeSet)) {
                             return errorType;
                         }
                         var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
@@ -54259,6 +55611,15 @@ var ts;
             }
             return result;
         }
+        function checkCrossProductUnion(types) {
+            var size = ts.reduceLeft(types, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : t.flags & 131072 /* Never */ ? 0 : 1); }, 1);
+            if (size >= 100000) {
+                ts.tracing.instant("check" /* Check */, "checkCrossProductUnion_DepthLimit", { typeIds: types.map(function (t) { return t.id; }), size: size });
+                error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                return false;
+            }
+            return true;
+        }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -54278,6 +55639,24 @@ var ts;
                 type.resolvedStringIndexType || (type.resolvedStringIndexType = createIndexType(type, /*stringsOnly*/ true)) :
                 type.resolvedIndexType || (type.resolvedIndexType = createIndexType(type, /*stringsOnly*/ false));
         }
+        function getIndexTypeForMappedType(type, noIndexSignatures) {
+            var constraint = filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); });
+            var nameType = type.declaration.nameType && getTypeFromTypeNode(type.declaration.nameType);
+            return nameType ?
+                mapType(constraint, function (t) { return instantiateType(nameType, appendTypeMapping(type.mapper, getTypeParameterFromMappedType(type), t)); }) :
+                constraint;
+        }
+        // Ordinarily we reduce a keyof M where M is a mapped type { [P in K as N<P>]: X } to simply N<K>. This however presumes
+        // that N distributes over union types, i.e. that N<A | B | C> is equivalent to N<A> | N<B> | N<C>. That presumption is
+        // generally true, except when N is a non-distributive conditional type or an instantiable type with non-distributive
+        // conditional type as a constituent. In those cases, we cannot reduce keyof M and need to preserve it as is.
+        function isNonDistributiveNameType(type) {
+            return !!(type && (type.flags & 16777216 /* Conditional */ && !type.root.isDistributive ||
+                type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) && ts.some(type.types, isNonDistributiveNameType) ||
+                type.flags & (4194304 /* Index */ | 268435456 /* StringMapping */) && isNonDistributiveNameType(type.type) ||
+                type.flags & 8388608 /* IndexedAccess */ && isNonDistributiveNameType(type.indexType) ||
+                type.flags & 33554432 /* Substitution */ && isNonDistributiveNameType(type.substitute)));
+        }
         function getLiteralTypeFromPropertyName(name) {
             if (ts.isPrivateIdentifier(name)) {
                 return neverType;
@@ -54321,8 +55700,8 @@ var ts;
             type = getReducedType(type);
             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); })) :
-                    type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
+                    type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && isNonDistributiveNameType(getNameTypeFromMappedType(type)) ? getIndexTypeForGenericType(type, stringsOnly) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, noIndexSignatures) :
                             type === wildcardType ? wildcardType :
                                 type.flags & 2 /* Unknown */ ? neverType :
                                     type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
@@ -54346,15 +55725,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 137 /* KeyOfKeyword */:
+                    case 138 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 150 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 147 /* SymbolKeyword */
+                    case 151 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 148 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 141 /* ReadonlyKeyword */:
+                    case 142 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                     default:
@@ -54363,12 +55742,115 @@ var ts;
             }
             return links.resolvedType;
         }
-        function createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTemplateTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getTemplateLiteralType(__spreadArrays([node.head.text], ts.map(node.templateSpans, function (span) { return span.literal.text; })), ts.map(node.templateSpans, function (span) { return getTypeFromTypeNode(span.type); }));
+            }
+            return links.resolvedType;
+        }
+        function getTemplateLiteralType(texts, types) {
+            var unionIndex = ts.findIndex(types, function (t) { return !!(t.flags & (131072 /* Never */ | 1048576 /* Union */)); });
+            if (unionIndex >= 0) {
+                return checkCrossProductUnion(types) ?
+                    mapType(types[unionIndex], function (t) { return getTemplateLiteralType(texts, ts.replaceElement(types, unionIndex, t)); }) :
+                    errorType;
+            }
+            if (ts.contains(types, wildcardType)) {
+                return wildcardType;
+            }
+            var newTypes = [];
+            var newTexts = [];
+            var text = texts[0];
+            if (!addSpans(texts, types)) {
+                return stringType;
+            }
+            if (newTypes.length === 0) {
+                return getLiteralType(text);
+            }
+            newTexts.push(text);
+            var id = getTypeListId(newTypes) + "|" + ts.map(newTexts, function (t) { return t.length; }).join(",") + "|" + newTexts.join("");
+            var type = templateLiteralTypes.get(id);
+            if (!type) {
+                templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
+            }
+            return type;
+            function addSpans(texts, types) {
+                for (var i = 0; i < types.length; i++) {
+                    var t = types[i];
+                    if (t.flags & (2944 /* Literal */ | 65536 /* Null */ | 32768 /* Undefined */)) {
+                        text += getTemplateStringForType(t) || "";
+                        text += texts[i + 1];
+                    }
+                    else if (t.flags & 134217728 /* TemplateLiteral */) {
+                        text += t.texts[0];
+                        if (!addSpans(t.texts, t.types))
+                            return false;
+                        text += texts[i + 1];
+                    }
+                    else if (isGenericIndexType(t) || isPatternLiteralPlaceholderType(t)) {
+                        newTypes.push(t);
+                        newTexts.push(text);
+                        text = texts[i + 1];
+                    }
+                    else {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        function getTemplateStringForType(type) {
+            return type.flags & 128 /* StringLiteral */ ? type.value :
+                type.flags & 256 /* NumberLiteral */ ? "" + type.value :
+                    type.flags & 2048 /* BigIntLiteral */ ? ts.pseudoBigIntToString(type.value) :
+                        type.flags & 512 /* BooleanLiteral */ ? type.intrinsicName :
+                            type.flags & 65536 /* Null */ ? "null" :
+                                type.flags & 32768 /* Undefined */ ? "undefined" :
+                                    undefined;
+        }
+        function createTemplateLiteralType(texts, types) {
+            var type = createType(134217728 /* TemplateLiteral */);
+            type.texts = texts;
+            type.types = types;
+            return type;
+        }
+        function getStringMappingType(symbol, type) {
+            return type.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
+                isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
+                    type.flags & 128 /* StringLiteral */ ? getLiteralType(applyStringMapping(symbol, type.value)) :
+                        type;
+        }
+        function applyStringMapping(symbol, str) {
+            switch (intrinsicTypeKinds.get(symbol.escapedName)) {
+                case 0 /* Uppercase */: return str.toUpperCase();
+                case 1 /* Lowercase */: return str.toLowerCase();
+                case 2 /* Capitalize */: return str.charAt(0).toUpperCase() + str.slice(1);
+                case 3 /* Uncapitalize */: return str.charAt(0).toLowerCase() + str.slice(1);
+            }
+            return str;
+        }
+        function getStringMappingTypeForGenericType(symbol, type) {
+            var id = getSymbolId(symbol) + "," + getTypeId(type);
+            var result = stringMappingTypes.get(id);
+            if (!result) {
+                stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
+            }
+            return result;
+        }
+        function createStringMappingType(symbol, type) {
+            var result = createType(268435456 /* StringMapping */);
+            result.symbol = symbol;
+            result.type = type;
+            return result;
+        }
+        function createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments, shouldIncludeUndefined) {
             var type = createType(8388608 /* IndexedAccess */);
             type.objectType = objectType;
             type.indexType = indexType;
             type.aliasSymbol = aliasSymbol;
             type.aliasTypeArguments = aliasTypeArguments;
+            type.noUncheckedIndexedAccessCandidate = shouldIncludeUndefined;
             return type;
         }
         /**
@@ -54393,13 +55875,13 @@ var ts;
             if (type.flags & 2097152 /* Intersection */) {
                 return ts.some(type.types, isJSLiteralType);
             }
-            if (type.flags & 63176704 /* Instantiable */) {
+            if (type.flags & 465829888 /* Instantiable */) {
                 return isJSLiteralType(getResolvedBaseConstraint(type));
             }
             return false;
         }
         function getPropertyNameFromIndex(indexType, accessNode) {
-            var accessExpression = accessNode && accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode : undefined;
+            var accessExpression = accessNode && accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode : undefined;
             return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
@@ -54414,15 +55896,15 @@ var ts;
                 || !ts.isCallLikeExpression(ts.findAncestor(node, function (n) { return !ts.isAccessExpression(n); }) || node.parent)
                     && ts.every(symbol.declarations, function (d) { return !ts.isFunctionLike(d) || !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); });
         }
-        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags, reportDeprecated) {
-            var _a, _b;
-            var accessExpression = accessNode && accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode : undefined;
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags, noUncheckedIndexedAccessCandidate, reportDeprecated) {
+            var _a;
+            var accessExpression = accessNode && accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode : undefined;
             var propName = accessNode && ts.isPrivateIdentifier(accessNode) ? undefined : getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
-                    if (reportDeprecated && accessNode && ((_a = prop.valueDeclaration) === null || _a === void 0 ? void 0 : _a.flags) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) {
-                        var deprecatedNode = (_b = accessExpression === null || accessExpression === void 0 ? void 0 : accessExpression.argumentExpression) !== null && _b !== void 0 ? _b : (ts.isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode);
+                    if (reportDeprecated && accessNode && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) {
+                        var deprecatedNode = (_a = accessExpression === null || accessExpression === void 0 ? void 0 : accessExpression.argumentExpression) !== null && _a !== void 0 ? _a : (ts.isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode);
                         errorOrSuggestion(/* isError */ false, deprecatedNode, ts.Diagnostics._0_is_deprecated, propName);
                     }
                     if (accessExpression) {
@@ -54454,10 +55936,13 @@ var ts;
                         }
                     }
                     errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
-                    return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
+                    return mapType(objectType, function (t) {
+                        var restType = getRestTypeOfTupleType(t) || undefinedType;
+                        return noUncheckedIndexedAccessCandidate ? getUnionType([restType, undefinedType]) : restType;
+                    });
                 }
             }
-            if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 132 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
+            if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
@@ -54473,10 +55958,10 @@ var ts;
                     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;
+                        return noUncheckedIndexedAccessCandidate ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
                     }
                     errorIfWritingToReadonlyIndex(indexInfo);
-                    return indexInfo.type;
+                    return noUncheckedIndexedAccessCandidate ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
                     return neverType;
@@ -54560,11 +56045,17 @@ var ts;
             }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode.argumentExpression :
-                accessNode.kind === 188 /* IndexedAccessType */ ? accessNode.indexType :
-                    accessNode.kind === 157 /* ComputedPropertyName */ ? accessNode.expression :
+            return accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode.argumentExpression :
+                accessNode.kind === 189 /* IndexedAccessType */ ? accessNode.indexType :
+                    accessNode.kind === 158 /* ComputedPropertyName */ ? accessNode.expression :
                         accessNode;
         }
+        function isPatternLiteralPlaceholderType(type) {
+            return templateConstraintType.types.indexOf(type) !== -1 || !!(type.flags & 1 /* Any */);
+        }
+        function isPatternLiteralType(type) {
+            return !!(type.flags & 134217728 /* TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
+        }
         function isGenericObjectType(type) {
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 if (!(type.objectFlags & 4194304 /* IsGenericObjectTypeComputed */)) {
@@ -54583,7 +56074,7 @@ var ts;
                 }
                 return !!(type.objectFlags & 33554432 /* IsGenericIndexType */);
             }
-            return !!(type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */));
+            return !!(type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */)) && !isPatternLiteralType(type);
         }
         function isThisTypeParameter(type) {
             return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
@@ -54636,7 +56127,7 @@ var ts;
                 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 */)) {
+            if (!(indexType.flags & 465829888 /* Instantiable */)) {
                 // (T | U)[K] -> T[K] | U[K] (reading)
                 // (T | U)[K] -> T[K] & U[K] (writing)
                 // (T & U)[K] -> T[K] & U[K]
@@ -54699,8 +56190,9 @@ var ts;
             var templateMapper = combineTypeMappers(objectType.mapper, mapper);
             return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, aliasSymbol, aliasTypeArguments) {
-            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
+        function getIndexedAccessType(objectType, indexType, noUncheckedIndexedAccessCandidate, accessNode, aliasSymbol, aliasTypeArguments, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, noUncheckedIndexedAccessCandidate, accessNode, accessFlags, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
         }
         function indexTypeLessThan(indexType, limit) {
             return everyType(indexType, function (t) {
@@ -54714,11 +56206,14 @@ var ts;
                 return false;
             });
         }
-        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags, aliasSymbol, aliasTypeArguments) {
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, noUncheckedIndexedAccessCandidate, accessNode, accessFlags, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            var shouldIncludeUndefined = noUncheckedIndexedAccessCandidate ||
+                (!!compilerOptions.noUncheckedIndexedAccess &&
+                    (accessFlags & (2 /* Writing */ | 16 /* ExpressionPosition */)) === 16 /* ExpressionPosition */);
             // 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 */)) {
@@ -54730,17 +56225,17 @@ var ts;
             // 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 !== 188 /* IndexedAccessType */ ?
+            if (isGenericIndexType(indexType) || (accessNode && accessNode.kind !== 189 /* IndexedAccessType */ ?
                 isGenericTupleType(objectType) && !indexTypeLessThan(indexType, objectType.target.fixedLength) :
                 isGenericObjectType(objectType) && !(isTupleType(objectType) && indexTypeLessThan(indexType, objectType.target.fixedLength)))) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
                 // Defer the operation by creating an indexed access type.
-                var id = objectType.id + "," + indexType.id;
+                var id = objectType.id + "," + indexType.id + (shouldIncludeUndefined ? "?" : "");
                 var type = indexedAccessTypes.get(id);
                 if (!type) {
-                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments));
+                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, aliasSymbol, aliasTypeArguments, shouldIncludeUndefined));
                 }
                 return type;
             }
@@ -54753,7 +56248,7 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags, shouldIncludeUndefined);
                     if (propType) {
                         propTypes.push(propType);
                     }
@@ -54769,9 +56264,11 @@ var ts;
                 if (wasMissingProp) {
                     return undefined;
                 }
-                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                return accessFlags & 2 /* Writing */
+                    ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments)
+                    : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
             }
-            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */, /* reportDeprecated */ true);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */, shouldIncludeUndefined, /* reportDeprecated */ true);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -54779,7 +56276,7 @@ var ts;
                 var objectType = getTypeFromTypeNode(node.objectType);
                 var indexType = getTypeFromTypeNode(node.indexType);
                 var potentialAlias = getAliasSymbolForTypeNode(node);
-                var resolved = getIndexedAccessType(objectType, indexType, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias));
+                var resolved = getIndexedAccessType(objectType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias));
                 links.resolvedType = resolved.flags & 8388608 /* IndexedAccess */ &&
                     resolved.objectType === objectType &&
                     resolved.indexType === indexType ?
@@ -54814,7 +56311,7 @@ var ts;
         function getConditionalType(root, mapper) {
             var result;
             var extraTypes;
-            var _loop_14 = function () {
+            var _loop_15 = function () {
                 var checkType = instantiateType(root.checkType, mapper);
                 var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
                 var extendsType = instantiateType(root.extendsType, mapper);
@@ -54847,11 +56344,11 @@ var ts;
                     if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
                         // Return union of trueType and falseType for 'any' since it matches anything
                         if (checkType.flags & 1 /* Any */) {
-                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                            (extraTypes || (extraTypes = [])).push(instantiateType(getTypeFromTypeNode(root.node.trueType), combinedMapper || mapper));
                         }
                         // If falseType is an immediately nested conditional type that isn't distributive or has an
                         // identical checkType, switch to that type and loop.
-                        var falseType_1 = root.falseType;
+                        var falseType_1 = getTypeFromTypeNode(root.node.falseType);
                         if (falseType_1.flags & 16777216 /* Conditional */) {
                             var newRoot = falseType_1.root;
                             if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
@@ -54859,7 +56356,7 @@ var ts;
                                 return "continue";
                             }
                         }
-                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        result = instantiateType(falseType_1, mapper);
                         return "break";
                     }
                     // Return trueType for a definitely true extends check. We check instantiations of the two
@@ -54868,7 +56365,7 @@ var ts;
                     //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
                     // doesn't immediately resolve to 'string' instead of being deferred.
                     if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        result = instantiateType(getTypeFromTypeNode(root.node.trueType), combinedMapper || mapper);
                         return "break";
                     }
                 }
@@ -54888,7 +56385,7 @@ var ts;
             // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
             // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
             while (true) {
-                var state_4 = _loop_14();
+                var state_4 = _loop_15();
                 if (typeof state_4 === "object")
                     return state_4.value;
                 if (state_4 === "break")
@@ -54897,13 +56394,13 @@ var ts;
             return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
-            return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
+            return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(getTypeFromTypeNode(type.root.node.trueType), type.mapper));
         }
         function getFalseTypeFromConditionalType(type) {
-            return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
+            return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(getTypeFromTypeNode(type.root.node.falseType), type.mapper));
         }
         function getInferredTrueTypeFromConditionalType(type) {
-            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(getTypeFromTypeNode(type.root.node.trueType), type.combinedMapper) : getTrueTypeFromConditionalType(type));
         }
         function getInferTypeParameters(node) {
             var result;
@@ -54928,8 +56425,6 @@ var ts;
                     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,
@@ -54987,7 +56482,13 @@ var ts;
                     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);
+                        // typeof a.b.c is normally resolved using `checkExpression` which in turn defers to `checkQualifiedName`
+                        // That, in turn, ultimately uses `getPropertyOfType` on the type of the symbol, which differs slightly from
+                        // the `exports` lookup process that only looks up namespace members which is used for most type references
+                        var mergedResolvedSymbol = getMergedSymbol(resolveSymbol(currentNamespace));
+                        var next = node.isTypeOf
+                            ? getPropertyOfType(getTypeOfSymbol(mergedResolvedSymbol), current.escapedText)
+                            : getSymbol(getExportsOfSymbol(mergedResolvedSymbol), 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;
@@ -55046,7 +56547,7 @@ var ts;
         }
         function getAliasSymbolForTypeNode(node) {
             var host = node.parent;
-            while (ts.isParenthesizedTypeNode(host) || ts.isTypeOperatorNode(host) && host.operator === 141 /* ReadonlyKeyword */) {
+            while (ts.isParenthesizedTypeNode(host) || ts.isJSDocTypeExpression(host) || ts.isTypeOperatorNode(host) && host.operator === 142 /* ReadonlyKeyword */) {
                 host = host.parent;
             }
             return ts.isTypeAlias(host) ? getSymbolOfNode(host) : undefined;
@@ -55058,12 +56559,7 @@ var ts;
             return !!(type.flags & 524288 /* Object */) && !isGenericMappedType(type);
         }
         function isEmptyObjectTypeOrSpreadsIntoEmptyObject(type) {
-            return isEmptyObjectType(type) || !!(type.flags & (65536 /* Null */ | 32768 /* Undefined */ | 528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */));
-        }
-        function isSinglePropertyAnonymousObjectType(type) {
-            return !!(type.flags & 524288 /* Object */) &&
-                !!(ts.getObjectFlags(type) & 16 /* Anonymous */) &&
-                (ts.length(getPropertiesOfType(type)) === 1 || ts.every(getPropertiesOfType(type), function (p) { return !!(p.flags & 16777216 /* Optional */); }));
+            return isEmptyObjectType(type) || !!(type.flags & (65536 /* Null */ | 32768 /* Undefined */ | 528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 402653316 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */));
         }
         function tryMergeUnionOfObjectTypeAndEmptyObject(type, readonly) {
             if (type.types.length === 2) {
@@ -55072,10 +56568,10 @@ var ts;
                 if (ts.every(type.types, isEmptyObjectTypeOrSpreadsIntoEmptyObject)) {
                     return isEmptyObjectType(firstType) ? firstType : isEmptyObjectType(secondType) ? secondType : emptyObjectType;
                 }
-                if (isEmptyObjectTypeOrSpreadsIntoEmptyObject(firstType) && isSinglePropertyAnonymousObjectType(secondType)) {
+                if (isEmptyObjectTypeOrSpreadsIntoEmptyObject(firstType)) {
                     return getAnonymousPartialType(secondType);
                 }
-                if (isEmptyObjectTypeOrSpreadsIntoEmptyObject(secondType) && isSinglePropertyAnonymousObjectType(firstType)) {
+                if (isEmptyObjectTypeOrSpreadsIntoEmptyObject(secondType)) {
                     return getAnonymousPartialType(firstType);
                 }
             }
@@ -55126,16 +56622,20 @@ var ts;
                 if (merged) {
                     return getSpreadType(merged, right, symbol, objectFlags, readonly);
                 }
-                return mapType(left, function (t) { return getSpreadType(t, right, symbol, objectFlags, readonly); });
+                return checkCrossProductUnion([left, right])
+                    ? mapType(left, function (t) { return getSpreadType(t, right, symbol, objectFlags, readonly); })
+                    : errorType;
             }
             if (right.flags & 1048576 /* Union */) {
                 var merged = tryMergeUnionOfObjectTypeAndEmptyObject(right, readonly);
                 if (merged) {
                     return getSpreadType(left, merged, symbol, objectFlags, readonly);
                 }
-                return mapType(right, function (t) { return getSpreadType(left, t, symbol, objectFlags, readonly); });
+                return checkCrossProductUnion([left, right])
+                    ? mapType(right, function (t) { return getSpreadType(left, t, symbol, objectFlags, readonly); })
+                    : errorType;
             }
-            if (right.flags & (528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */)) {
+            if (right.flags & (528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 402653316 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */)) {
                 return left;
             }
             if (isGenericObjectType(left) || isGenericObjectType(right)) {
@@ -55296,7 +56796,7 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 250 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 253 /* InterfaceDeclaration */)) {
                 if (!ts.hasSyntacticModifier(container, 32 /* Static */) &&
                     (!ts.isConstructorDeclaration(container) || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
@@ -55331,17 +56831,17 @@ var ts;
         }
         function getArrayElementTypeNode(node) {
             switch (node.kind) {
-                case 185 /* ParenthesizedType */:
+                case 186 /* ParenthesizedType */:
                     return getArrayElementTypeNode(node.type);
-                case 178 /* TupleType */:
+                case 179 /* TupleType */:
                     if (node.elements.length === 1) {
                         node = node.elements[0];
-                        if (node.kind === 180 /* RestType */ || node.kind === 191 /* NamedTupleMember */ && node.dotDotDotToken) {
+                        if (node.kind === 181 /* RestType */ || node.kind === 192 /* NamedTupleMember */ && node.dotDotDotToken) {
                             return getArrayElementTypeNode(node.type);
                         }
                     }
                     break;
-                case 177 /* ArrayType */:
+                case 178 /* ArrayType */:
                     return node.elementType;
             }
             return undefined;
@@ -55359,94 +56859,98 @@ var ts;
         function getTypeFromTypeNodeWorker(node) {
             switch (node.kind) {
                 case 128 /* AnyKeyword */:
-                case 299 /* JSDocAllType */:
-                case 300 /* JSDocUnknownType */:
+                case 303 /* JSDocAllType */:
+                case 304 /* JSDocUnknownType */:
                     return anyType;
-                case 151 /* UnknownKeyword */:
+                case 152 /* UnknownKeyword */:
                     return unknownType;
-                case 146 /* StringKeyword */:
+                case 147 /* StringKeyword */:
                     return stringType;
-                case 143 /* NumberKeyword */:
+                case 144 /* NumberKeyword */:
                     return numberType;
-                case 154 /* BigIntKeyword */:
+                case 155 /* BigIntKeyword */:
                     return bigintType;
                 case 131 /* BooleanKeyword */:
                     return booleanType;
-                case 147 /* SymbolKeyword */:
+                case 148 /* SymbolKeyword */:
                     return esSymbolType;
                 case 113 /* VoidKeyword */:
                     return voidType;
-                case 149 /* UndefinedKeyword */:
+                case 150 /* UndefinedKeyword */:
                     return undefinedType;
                 case 103 /* NullKeyword */:
                     // TODO(rbuckton): `NullKeyword` is no longer a `TypeNode`, but we defensively allow it here because of incorrect casts in the Language Service.
                     return nullType;
-                case 140 /* NeverKeyword */:
+                case 141 /* NeverKeyword */:
                     return neverType;
-                case 144 /* ObjectKeyword */:
+                case 145 /* ObjectKeyword */:
                     return node.flags & 131072 /* JavaScriptFile */ && !noImplicitAny ? anyType : nonPrimitiveType;
-                case 186 /* ThisType */:
+                case 136 /* IntrinsicKeyword */:
+                    return intrinsicMarkerType;
+                case 187 /* ThisType */:
                 case 107 /* ThisKeyword */:
                     // TODO(rbuckton): `ThisKeyword` is no longer a `TypeNode`, but we defensively allow it here because of incorrect casts in the Language Service and because of `isPartOfTypeNode`.
                     return getTypeFromThisTypeNode(node);
-                case 190 /* LiteralType */:
+                case 191 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 171 /* TypePredicate */:
+                case 172 /* TypePredicate */:
                     return node.assertsModifier ? voidType : booleanType;
-                case 220 /* ExpressionWithTypeArguments */:
+                case 223 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 175 /* TypeQuery */:
+                case 176 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 177 /* ArrayType */:
-                case 178 /* TupleType */:
+                case 178 /* ArrayType */:
+                case 179 /* TupleType */:
                     return getTypeFromArrayOrTupleTypeNode(node);
-                case 179 /* OptionalType */:
+                case 180 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 181 /* UnionType */:
+                case 182 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 182 /* IntersectionType */:
+                case 183 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 301 /* JSDocNullableType */:
+                case 305 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 303 /* JSDocOptionalType */:
+                case 307 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 191 /* NamedTupleMember */:
+                case 192 /* NamedTupleMember */:
                     return getTypeFromNamedTupleTypeNode(node);
-                case 185 /* ParenthesizedType */:
-                case 302 /* JSDocNonNullableType */:
-                case 298 /* JSDocTypeExpression */:
+                case 186 /* ParenthesizedType */:
+                case 306 /* JSDocNonNullableType */:
+                case 301 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 180 /* RestType */:
+                case 181 /* RestType */:
                     return getTypeFromRestTypeNode(node);
-                case 305 /* JSDocVariadicType */:
+                case 309 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 173 /* FunctionType */:
-                case 174 /* ConstructorType */:
-                case 176 /* TypeLiteral */:
-                case 308 /* JSDocTypeLiteral */:
-                case 304 /* JSDocFunctionType */:
-                case 309 /* JSDocSignature */:
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */:
+                case 177 /* TypeLiteral */:
+                case 312 /* JSDocTypeLiteral */:
+                case 308 /* JSDocFunctionType */:
+                case 313 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 187 /* TypeOperator */:
+                case 188 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 188 /* IndexedAccessType */:
+                case 189 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 189 /* MappedType */:
+                case 190 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 183 /* ConditionalType */:
+                case 184 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 184 /* InferType */:
+                case 185 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 192 /* ImportType */:
+                case 193 /* TemplateLiteralType */:
+                    return getTypeFromTemplateTypeNode(node);
+                case 195 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier, qualified name, or property access expression is a type expression
                 // Callers should first ensure this by calling `isPartOfTypeNode`
                 // TODO(rbuckton): These aren't valid TypeNodes, but we treat them as such because of `isPartOfTypeNode`, which returns `true` for things that aren't `TypeNode`s.
                 case 78 /* Identifier */:
-                case 156 /* QualifiedName */:
-                case 198 /* PropertyAccessExpression */:
+                case 157 /* QualifiedName */:
+                case 201 /* PropertyAccessExpression */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -55600,9 +57104,10 @@ var ts;
             return result;
         }
         function getObjectTypeInstantiation(type, mapper) {
-            var target = type.objectFlags & 64 /* Instantiated */ ? type.target : type;
             var declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.symbol.declarations[0];
             var links = getNodeLinks(declaration);
+            var target = type.objectFlags & 4 /* Reference */ ? links.resolvedType :
+                type.objectFlags & 64 /* Instantiated */ ? type.target : type;
             var typeParameters = links.outerTypeParameters;
             if (!typeParameters) {
                 // The first time an anonymous type is instantiated we compute and store a list of the type
@@ -55619,10 +57124,6 @@ var ts;
                     ts.filter(typeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, declaration); }) :
                     typeParameters;
                 links.outerTypeParameters = typeParameters;
-                if (typeParameters.length) {
-                    links.instantiations = new ts.Map();
-                    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
@@ -55631,22 +57132,26 @@ var ts;
                 var combinedMapper_1 = combineTypeMappers(type.mapper, mapper);
                 var typeArguments = ts.map(typeParameters, function (t) { return getMappedType(t, combinedMapper_1); });
                 var id = getTypeListId(typeArguments);
-                var result = links.instantiations.get(id);
+                if (!target.instantiations) {
+                    target.instantiations = new ts.Map();
+                    target.instantiations.set(getTypeListId(typeParameters), target);
+                }
+                var result = target.instantiations.get(id);
                 if (!result) {
                     var newMapper = createTypeMapper(typeParameters, typeArguments);
                     result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper) :
                         target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper) :
                             instantiateAnonymousType(target, newMapper);
-                    links.instantiations.set(id, result);
+                    target.instantiations.set(id, result);
                 }
                 return result;
             }
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 156 /* QualifiedName */ ||
-                node.parent.kind === 172 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName ||
-                node.parent.kind === 192 /* ImportType */ && node.parent.typeArguments && node === node.parent.qualifier);
+            return !(node.kind === 157 /* QualifiedName */ ||
+                node.parent.kind === 173 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName ||
+                node.parent.kind === 195 /* ImportType */ && node.parent.typeArguments && node === node.parent.qualifier);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
@@ -55655,7 +57160,7 @@ var ts;
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
                 var container = tp.symbol.declarations[0].parent;
                 for (var n = node; n !== container; n = n.parent) {
-                    if (!n || n.kind === 227 /* Block */ || n.kind === 183 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                    if (!n || n.kind === 230 /* Block */ || n.kind === 184 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
                         return true;
                     }
                 }
@@ -55664,12 +57169,12 @@ var ts;
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 186 /* ThisType */:
+                    case 187 /* ThisType */:
                         return !!tp.isThisType;
                     case 78 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNodeWorker(node) === tp; // use worker because we're looking for === equality
-                    case 175 /* TypeQuery */:
+                    case 176 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -55702,13 +57207,18 @@ var ts;
                 if (typeVariable !== mappedTypeVariable) {
                     return mapType(getReducedType(mappedTypeVariable), function (t) {
                         if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && t !== errorType) {
-                            if (isGenericTupleType(t)) {
-                                return instantiateMappedGenericTupleType(t, type, typeVariable, mapper);
+                            if (!type.declaration.nameType) {
+                                if (isArrayType(t)) {
+                                    return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable, t, mapper));
+                                }
+                                if (isGenericTupleType(t)) {
+                                    return instantiateMappedGenericTupleType(t, type, typeVariable, mapper);
+                                }
+                                if (isTupleType(t)) {
+                                    return instantiateMappedTupleType(t, type, prependTypeMapping(typeVariable, t, mapper));
+                                }
                             }
-                            var replacementMapper = prependTypeMapping(typeVariable, t, mapper);
-                            return isArrayType(t) ? instantiateMappedArrayType(t, type, replacementMapper) :
-                                isTupleType(t) ? instantiateMappedTupleType(t, type, replacementMapper) :
-                                    instantiateAnonymousType(type, replacementMapper);
+                            return instantiateAnonymousType(type, prependTypeMapping(typeVariable, t, mapper));
                         }
                         return t;
                     });
@@ -55817,6 +57327,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.
+                ts.tracing.instant("check" /* Check */, "instantiateType_DepthLimit", { typeId: type.id, instantiationDepth: instantiationDepth, instantiationCount: instantiationCount });
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
@@ -55827,16 +57338,6 @@ var ts;
             instantiationDepth--;
             return result;
         }
-        /**
-         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
-         * simplification. It essentially removes the depth increase done in `instantiateType`.
-         */
-        function instantiateTypeWithoutDepthIncrease(type, mapper) {
-            instantiationDepth--;
-            var result = instantiateType(type, mapper);
-            instantiationDepth++;
-            return result;
-        }
         function instantiateTypeWorker(type, mapper) {
             var flags = type.flags;
             if (flags & 262144 /* TypeParameter */) {
@@ -55865,8 +57366,14 @@ var ts;
             if (flags & 4194304 /* Index */) {
                 return getIndexType(instantiateType(type.type, mapper));
             }
+            if (flags & 134217728 /* TemplateLiteral */) {
+                return getTemplateLiteralType(type.texts, instantiateTypes(type.types, mapper));
+            }
+            if (flags & 268435456 /* StringMapping */) {
+                return getStringMappingType(type.symbol, instantiateType(type.type, mapper));
+            }
             if (flags & 8388608 /* IndexedAccess */) {
-                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), /*accessNode*/ undefined, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), type.noUncheckedIndexedAccessCandidate, /*accessNode*/ undefined, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
             }
             if (flags & 16777216 /* Conditional */) {
                 return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper));
@@ -55912,35 +57419,35 @@ 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 !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 164 /* MethodDeclaration */:
-                case 248 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 165 /* MethodDeclaration */:
+                case 251 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return (node.operatorToken.kind === 56 /* BarBarToken */ || node.operatorToken.kind === 60 /* QuestionQuestionToken */) &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 278 /* JsxAttributes */:
+                case 281 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 277 /* JsxAttribute */: {
+                case 280 /* 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 280 /* JsxExpression */: {
+                case 283 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -55959,7 +57466,7 @@ var ts;
                 if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                     return true;
                 }
-                if (node.kind !== 206 /* ArrowFunction */) {
+                if (node.kind !== 209 /* 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);
@@ -55972,7 +57479,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 227 /* Block */ && isContextSensitive(node.body);
+            return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 230 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -56028,7 +57535,7 @@ var ts;
                     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));
+                                hasBaseType(source, getTargetType(target)) || (isArrayType(target) && !isReadonlyArrayType(target) && isTypeDerivedFrom(source, globalReadonlyArrayType));
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -56075,23 +57582,23 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 280 /* JsxExpression */:
-                case 204 /* ParenthesizedExpression */:
+                case 283 /* JsxExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                         case 27 /* CommaToken */:
                             return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 278 /* JsxAttributes */:
+                case 281 /* JsxAttributes */:
                     return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
@@ -56291,7 +57798,7 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 280 /* JsxExpression */:
+                case 283 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
@@ -56300,18 +57807,15 @@ var ts;
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 270 /* JsxElement */:
-                case 271 /* JsxSelfClosingElement */:
-                case 274 /* JsxFragment */:
+                case 273 /* JsxElement */:
+                case 274 /* JsxSelfClosingElement */:
+                case 277 /* 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, containingMessageChain, errorOutputContainer) {
             var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
@@ -56321,7 +57825,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = getSemanticJsxChildren(containingElement.children);
+                var validChildren = ts.getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -56453,11 +57957,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 167 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 166 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 164 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 286 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 285 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 168 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 167 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 165 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 289 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 288 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -56534,8 +58038,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 164 /* MethodDeclaration */ &&
-                kind !== 163 /* MethodSignature */ && kind !== 165 /* Constructor */;
+            var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 165 /* MethodDeclaration */ &&
+                kind !== 164 /* MethodSignature */ && kind !== 166 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -56556,34 +58060,36 @@ var ts;
             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 = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(sourceType));
-                var targetSig = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(targetType));
-                var callbacks = sourceSig && targetSig && !getTypePredicateOfSignature(sourceSig) && !getTypePredicateOfSignature(targetSig) &&
-                    (getFalsyFlags(sourceType) & 98304 /* Nullable */) === (getFalsyFlags(targetType) & 98304 /* Nullable */);
-                var related = callbacks ?
-                    compareSignaturesRelated(targetSig, sourceSig, (checkMode & 8 /* StrictArity */) | (strictVariance ? 2 /* StrictCallback */ : 1 /* BivariantCallback */), reportErrors, errorReporter, incompatibleErrorReporter, compareTypes, reportUnreliableMarkers) :
-                    !(checkMode & 3 /* Callback */) && !strictVariance && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
-                // With strict arity, (x: number | undefined) => void is a subtype of (x?: number | undefined) => void
-                if (related && checkMode & 8 /* StrictArity */ && i >= getMinArgumentCount(source) && i < getMinArgumentCount(target) && compareTypes(sourceType, targetType, /*reportErrors*/ false)) {
-                    related = 0 /* False */;
-                }
-                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)));
+                var sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+                var targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+                if (sourceType && targetType) {
+                    // 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 = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(sourceType));
+                    var targetSig = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(targetType));
+                    var callbacks = sourceSig && targetSig && !getTypePredicateOfSignature(sourceSig) && !getTypePredicateOfSignature(targetSig) &&
+                        (getFalsyFlags(sourceType) & 98304 /* Nullable */) === (getFalsyFlags(targetType) & 98304 /* Nullable */);
+                    var related = callbacks ?
+                        compareSignaturesRelated(targetSig, sourceSig, (checkMode & 8 /* StrictArity */) | (strictVariance ? 2 /* StrictCallback */ : 1 /* BivariantCallback */), reportErrors, errorReporter, incompatibleErrorReporter, compareTypes, reportUnreliableMarkers) :
+                        !(checkMode & 3 /* Callback */) && !strictVariance && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
+                    // With strict arity, (x: number | undefined) => void is a subtype of (x?: number | undefined) => void
+                    if (related && checkMode & 8 /* StrictArity */ && i >= getMinArgumentCount(source) && i < getMinArgumentCount(target) && compareTypes(sourceType, targetType, /*reportErrors*/ false)) {
+                        related = 0 /* False */;
                     }
-                    return 0 /* False */;
+                    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;
                 }
-                result &= related;
             }
             if (!(checkMode & 4 /* IgnoreReturnTypes */)) {
                 // If a signature resolution is already in-flight, skip issuing a circularity error
@@ -56726,7 +58232,7 @@ var ts;
                 return true;
             if (t & 131072 /* Never */)
                 return false;
-            if (s & 132 /* StringLike */ && t & 4 /* String */)
+            if (s & 402653316 /* StringLike */ && t & 4 /* String */)
                 return true;
             if (s & 128 /* StringLiteral */ && s & 1024 /* EnumLiteral */ &&
                 t & 128 /* StringLiteral */ && !(t & 1024 /* EnumLiteral */) &&
@@ -56788,7 +58294,7 @@ var ts;
             }
             else {
                 if (!(source.flags & 3145728 /* UnionOrIntersection */) && !(target.flags & 3145728 /* UnionOrIntersection */) &&
-                    source.flags !== target.flags && !(source.flags & 66584576 /* Substructure */))
+                    source.flags !== target.flags && !(source.flags & 469237760 /* Substructure */))
                     return false;
             }
             if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
@@ -56797,7 +58303,7 @@ var ts;
                     return !!(related & 1 /* Succeeded */);
                 }
             }
-            if (source.flags & 66846720 /* StructuredOrInstantiable */ || target.flags & 66846720 /* StructuredOrInstantiable */) {
+            if (source.flags & 469499904 /* StructuredOrInstantiable */ || target.flags & 469499904 /* StructuredOrInstantiable */) {
                 return checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined);
             }
             return false;
@@ -56850,6 +58356,7 @@ var ts;
                 reportIncompatibleStack();
             }
             if (overflow) {
+                ts.tracing.instant("check" /* Check */, "checkTypeRelatedTo_DepthLimit", { sourceId: source.id, targetId: target.id, depth: depth });
                 var diag = error(errorNode || currentNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
                 if (errorOutputContainer) {
                     (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
@@ -57224,7 +58731,7 @@ var ts;
                         //          breaking the intersection apart.
                         result = someTypeRelatedToType(source, target, /*reportErrors*/ false, 1 /* Source */);
                     }
-                    if (!result && (source.flags & 66846720 /* StructuredOrInstantiable */ || target.flags & 66846720 /* StructuredOrInstantiable */)) {
+                    if (!result && (source.flags & 469499904 /* StructuredOrInstantiable */ || target.flags & 469499904 /* StructuredOrInstantiable */)) {
                         if (result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
                         }
@@ -57322,7 +58829,7 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var flags = source.flags & target.flags;
-                if (!(flags & 66584576 /* Substructure */)) {
+                if (!(flags & 469237760 /* Substructure */)) {
                     return 0 /* False */;
                 }
                 if (flags & 3145728 /* UnionOrIntersection */) {
@@ -57358,7 +58865,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_15 = function (prop) {
+                var _loop_16 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -57421,7 +58928,7 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_5 = _loop_15(prop);
+                    var state_5 = _loop_16(prop);
                     if (typeof state_5 === "object")
                         return state_5.value;
                 }
@@ -57607,7 +59114,7 @@ var ts;
                     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 */;
+                            return 3 /* Maybe */;
                         }
                     }
                     if (depth === 100) {
@@ -57635,7 +59142,16 @@ var ts;
                         return originalHandler(onlyUnreliable);
                     };
                 }
-                var result = expandingFlags !== 3 /* Both */ ? structuredTypeRelatedTo(source, target, reportErrors, intersectionState) : 1 /* Maybe */;
+                if (expandingFlags === 3 /* Both */) {
+                    ts.tracing.instant("check" /* Check */, "recursiveTypeRelatedTo_DepthLimit", {
+                        sourceId: source.id,
+                        sourceIdStack: sourceStack.map(function (t) { return t.id; }),
+                        targetId: target.id,
+                        targetIdStack: targetStack.map(function (t) { return t.id; }),
+                        depth: depth,
+                    });
+                }
+                var result = expandingFlags !== 3 /* Both */ ? structuredTypeRelatedTo(source, target, reportErrors, intersectionState) : 3 /* Maybe */;
                 if (outofbandVarianceMarkerHandler) {
                     outofbandVarianceMarkerHandler = originalHandler;
                 }
@@ -57643,9 +59159,12 @@ var ts;
                 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 */ | propagatingVarianceFlags);
+                        if (result === -1 /* True */ || result === 3 /* Maybe */) {
+                            // If result is definitely true, record all maybe keys as having succeeded. Also, record Ternary.Maybe
+                            // results as having succeeded once we reach depth 0, but never record Ternary.Unknown results.
+                            for (var i = maybeStart; i < maybeCount; i++) {
+                                relation.set(maybeKeys[i], 1 /* Succeeded */ | propagatingVarianceFlags);
+                            }
                         }
                         maybeCount = maybeStart;
                     }
@@ -57659,6 +59178,12 @@ var ts;
                 return result;
             }
             function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
+                ts.tracing.push("check" /* Check */, "structuredTypeRelatedTo", { sourceId: source.id, targetId: target.id });
+                var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState);
+                ts.tracing.pop();
+                return result;
+            }
+            function structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState) {
                 if (intersectionState & 4 /* PropertyCheck */) {
                     return propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined, 0 /* None */);
                 }
@@ -57705,7 +59230,7 @@ var ts;
                     !(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
                     var variances = getAliasVariances(source.aliasSymbol);
                     if (variances === ts.emptyArray) {
-                        return 1 /* Maybe */;
+                        return 1 /* Unknown */;
                     }
                     var varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances, intersectionState);
                     if (varianceResult !== undefined) {
@@ -57720,7 +59245,7 @@ var ts;
                 }
                 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 (ts.getObjectFlags(source) & 32 /* Mapped */ && !source.declaration.nameType && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(source))) {
                         if (!(getMappedTypeModifiers(source) & 4 /* IncludeOptional */)) {
                             var templateType = getTemplateTypeFromMappedType(source);
                             var indexedAccessType = getIndexedAccessType(target, getTypeParameterFromMappedType(source));
@@ -57770,14 +59295,14 @@ var ts;
                         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);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, target.noUncheckedIndexedAccessCandidate, /*accessNode*/ undefined, accessFlags);
                             if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
                     }
                 }
-                else if (isGenericMappedType(target)) {
+                else if (isGenericMappedType(target) && !target.declaration.nameType) {
                     // A source type T is related to a target type { [P in X]: T[P] }
                     var template = getTemplateTypeFromMappedType(target);
                     var modifiers = getMappedTypeModifiers(target);
@@ -57819,6 +59344,15 @@ var ts;
                         }
                     }
                 }
+                else if (target.flags & 134217728 /* TemplateLiteral */ && source.flags & 128 /* StringLiteral */) {
+                    if (isPatternLiteralType(target)) {
+                        // match all non-`string` segments
+                        var result_8 = inferLiteralsFromTemplateLiteralType(source, target);
+                        if (result_8 && ts.every(result_8, function (r, i) { return isStringLiteralTypeValueParsableAsType(r, target.types[i]); })) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 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.
@@ -57857,6 +59391,35 @@ var ts;
                         return result;
                     }
                 }
+                else if (source.flags & 134217728 /* TemplateLiteral */) {
+                    if (target.flags & 134217728 /* TemplateLiteral */ &&
+                        source.texts.length === target.texts.length &&
+                        source.types.length === target.types.length &&
+                        ts.every(source.texts, function (t, i) { return t === target.texts[i]; }) &&
+                        ts.every(instantiateType(source, makeFunctionTypeMapper(reportUnreliableMarkers)).types, function (t, i) { return !!(target.types[i].flags & (1 /* Any */ | 4 /* String */)) || !!isRelatedTo(t, target.types[i], /*reportErrors*/ false); })) {
+                        return -1 /* True */;
+                    }
+                    var constraint = getBaseConstraintOfType(source);
+                    if (constraint && constraint !== source && (result = isRelatedTo(constraint, target, reportErrors))) {
+                        resetErrorInfo(saveErrorInfo);
+                        return result;
+                    }
+                }
+                else if (source.flags & 268435456 /* StringMapping */) {
+                    if (target.flags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                        if (result = isRelatedTo(source.type, target.type, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
+                        }
+                    }
+                    else {
+                        var constraint = getBaseConstraintOfType(source);
+                        if (constraint && (result = isRelatedTo(constraint, target, reportErrors))) {
+                            resetErrorInfo(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
@@ -57935,7 +59498,7 @@ var ts;
                         // effectively means we measure variance only from type parameter occurrences that aren't nested in
                         // recursive instantiations of the generic type.
                         if (variances === ts.emptyArray) {
-                            return 1 /* Maybe */;
+                            return 1 /* Unknown */;
                         }
                         var varianceResult = relateVariances(getTypeArguments(source), getTypeArguments(target), variances, intersectionState);
                         if (varianceResult !== undefined) {
@@ -57992,9 +59555,9 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
                         var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */ | 2097152 /* Intersection */ | 33554432 /* Substitution */);
                         if (objectOnlyTarget.flags & 1048576 /* Union */) {
-                            var result_8 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
-                            if (result_8) {
-                                return result_8;
+                            var result_9 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_9) {
+                                return result_9;
                             }
                         }
                     }
@@ -58061,12 +59624,14 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_9;
+                    var result_10;
                     var targetConstraint = getConstraintTypeFromMappedType(target);
                     var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), makeFunctionTypeMapper(getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers));
-                    if (result_9 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
+                    if (result_10 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_9 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        if (instantiateType(getNameTypeFromMappedType(source), mapper) === instantiateType(getNameTypeFromMappedType(target), mapper)) {
+                            return result_10 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        }
                     }
                 }
                 return 0 /* False */;
@@ -58096,6 +59661,7 @@ var ts;
                     numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
                     if (numCombinations > 25) {
                         // We've reached the complexity limit.
+                        ts.tracing.instant("check" /* Check */, "typeRelatedToDiscriminatedType_DepthLimit", { sourceId: source.id, targetId: target.id, numCombinations: numCombinations });
                         return 0 /* False */;
                     }
                 }
@@ -58114,11 +59680,11 @@ var ts;
                 // 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_16 = function (combination) {
+                var _loop_17 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_17 = function (i) {
+                        var _loop_18 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -58134,7 +59700,7 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_7 = _loop_17(i);
+                            var state_7 = _loop_18(i);
                             switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
@@ -58148,7 +59714,7 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_6 = _loop_16(combination);
+                    var state_6 = _loop_17(combination);
                     if (typeof state_6 === "object")
                         return state_6.value;
                 }
@@ -58204,7 +59770,7 @@ var ts;
                     ts.Debug.assertIsDefined(links.deferralParent);
                     ts.Debug.assertIsDefined(links.deferralConstituents);
                     var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
-                    var result_10 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var result_11 = 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];
@@ -58214,7 +59780,7 @@ var ts;
                                 // 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_10 &= related;
+                            result_11 &= related;
                         }
                         else {
                             if (related) {
@@ -58222,17 +59788,17 @@ var ts;
                             }
                         }
                     }
-                    if (unionParent && !result_10 && targetIsOptional) {
-                        result_10 = isRelatedTo(source, undefinedType);
+                    if (unionParent && !result_11 && targetIsOptional) {
+                        result_11 = isRelatedTo(source, undefinedType);
                     }
-                    if (unionParent && !result_10 && reportErrors) {
+                    if (unionParent && !result_11 && 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_10;
+                    return result_11;
                 }
                 else {
                     return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors, /*headMessage*/ undefined, intersectionState);
@@ -58492,6 +60058,7 @@ var ts;
                 return result;
             }
             function signaturesRelatedTo(source, target, kind, reportErrors) {
+                var _a, _b;
                 if (relation === identityRelation) {
                     return signaturesIdenticalTo(source, target, kind);
                 }
@@ -58522,7 +60089,9 @@ var ts;
                 var result = -1 /* True */;
                 var saveErrorInfo = captureErrorCalculationState();
                 var incompatibleReporter = kind === 1 /* Construct */ ? reportIncompatibleConstructSignatureReturn : reportIncompatibleCallSignatureReturn;
-                if (ts.getObjectFlags(source) & 64 /* Instantiated */ && ts.getObjectFlags(target) & 64 /* Instantiated */ && source.symbol === target.symbol) {
+                var sourceObjectFlags = ts.getObjectFlags(source);
+                var targetObjectFlags = ts.getObjectFlags(target);
+                if (sourceObjectFlags & 64 /* Instantiated */ && targetObjectFlags & 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
@@ -58542,15 +60111,26 @@ var ts;
                     // 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, incompatibleReporter(sourceSignatures[0], targetSignatures[0]));
+                    var sourceSignature = ts.first(sourceSignatures);
+                    var targetSignature = ts.first(targetSignatures);
+                    result = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors, incompatibleReporter(sourceSignature, targetSignature));
+                    if (!result && reportErrors && kind === 1 /* Construct */ && (sourceObjectFlags & targetObjectFlags) &&
+                        (((_a = targetSignature.declaration) === null || _a === void 0 ? void 0 : _a.kind) === 166 /* Constructor */ || ((_b = sourceSignature.declaration) === null || _b === void 0 ? void 0 : _b.kind) === 166 /* Constructor */)) {
+                        var constructSignatureToString = function (signature) {
+                            return signatureToString(signature, /*enclosingDeclaration*/ undefined, 262144 /* WriteArrowStyleSignature */, kind);
+                        };
+                        reportError(ts.Diagnostics.Type_0_is_not_assignable_to_type_1, constructSignatureToString(sourceSignature), constructSignatureToString(targetSignature));
+                        reportError(ts.Diagnostics.Types_of_construct_signatures_are_incompatible);
+                        return result;
+                    }
                 }
                 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];
+                        for (var _c = 0, sourceSignatures_1 = sourceSignatures; _c < sourceSignatures_1.length; _c++) {
+                            var s = sourceSignatures_1[_c];
                             var related = signatureRelatedTo(s, t, /*erase*/ true, shouldElaborateErrors, incompatibleReporter(s, t));
                             if (related) {
                                 result &= related;
@@ -58714,13 +60294,13 @@ var ts;
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 return !!ts.forEach(type.types, typeCouldHaveTopLevelSingletonTypes);
             }
-            if (type.flags & 63176704 /* Instantiable */) {
+            if (type.flags & 465829888 /* Instantiable */) {
                 var constraint = getConstraintOfType(type);
-                if (constraint) {
+                if (constraint && constraint !== type) {
                     return typeCouldHaveTopLevelSingletonTypes(constraint);
                 }
             }
-            return isUnitType(type);
+            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */);
         }
         function getBestMatchingType(source, target, isRelatedTo) {
             if (isRelatedTo === void 0) { isRelatedTo = compareTypesAssignable; }
@@ -58754,8 +60334,18 @@ var ts;
                 }
             }
             var match = discriminable.indexOf(/*searchElement*/ true);
+            if (match === -1) {
+                return defaultValue;
+            }
             // make sure exactly 1 matches before returning it
-            return match === -1 || discriminable.indexOf(/*searchElement*/ true, match + 1) !== -1 ? defaultValue : target.types[match];
+            var nextMatch = discriminable.indexOf(/*searchElement*/ true, match + 1);
+            while (nextMatch !== -1) {
+                if (!isTypeIdenticalTo(target.types[match], target.types[nextMatch])) {
+                    return defaultValue;
+                }
+                nextMatch = discriminable.indexOf(/*searchElement*/ true, nextMatch + 1);
+            }
+            return target.types[match];
         }
         /**
          * A type is 'weak' if it is an object type with at least one optional property
@@ -58804,13 +60394,15 @@ var ts;
         // instantiations of the generic type for type arguments with known relations. The function
         // returns the emptyArray singleton when invoked recursively for the given generic type.
         function getVariancesWorker(typeParameters, cache, createMarkerType) {
+            var _a, _b, _c;
             if (typeParameters === void 0) { typeParameters = ts.emptyArray; }
             var variances = cache.variances;
             if (!variances) {
+                ts.tracing.push("check" /* Check */, "getVariancesWorker", { arity: typeParameters.length, id: (_c = (_a = cache.id) !== null && _a !== void 0 ? _a : (_b = cache.declaredType) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : -1 });
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_18 = function (tp) {
+                var _loop_19 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -58842,9 +60434,10 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_18(tp);
+                    _loop_19(tp);
                 }
                 cache.variances = variances;
+                ts.tracing.pop();
             }
             return variances;
         }
@@ -58975,58 +60568,54 @@ var ts;
         // has expanded into `[A<NonNullable<NonNullable<NonNullable<NonNullable<NonNullable<T>>>>>>]`
         // in such cases we need to terminate the expansion, and we do so here.
         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 */) {
-                if (!isObjectOrArrayLiteralType(type)) {
-                    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;
-                            }
-                        }
-                    }
-                }
-                if (ts.getObjectFlags(type) && 4 /* Reference */ && !!type.node) {
-                    var root = type.target;
+            if (depth >= 5) {
+                var identity_1 = getRecursionIdentity(type);
+                if (identity_1) {
                     var count = 0;
                     for (var i = 0; i < depth; i++) {
-                        var t = stack[i];
-                        if (ts.getObjectFlags(t) && 4 /* Reference */ && !!t.node && t.target === root) {
+                        if (getRecursionIdentity(stack[i]) === identity_1) {
                             count++;
-                            if (count >= 5)
+                            if (count >= 5) {
                                 return true;
+                            }
                         }
                     }
                 }
             }
-            if (depth >= 5 && type.flags & 8388608 /* IndexedAccess */) {
-                var root = getRootObjectTypeFromIndexedAccessChain(type);
-                var count = 0;
-                for (var i = 0; i < depth; i++) {
-                    var t = stack[i];
-                    if (getRootObjectTypeFromIndexedAccessChain(t) === root) {
-                        count++;
-                        if (count >= 5)
-                            return true;
-                    }
-                }
-            }
             return false;
         }
-        /**
-         * Gets the leftmost object type in a chain of indexed accesses, eg, in A[P][Q], returns A
-         */
-        function getRootObjectTypeFromIndexedAccessChain(type) {
-            var t = type;
-            while (t.flags & 8388608 /* IndexedAccess */) {
-                t = t.objectType;
+        // Types with constituents that could circularly reference the type have a recursion identity. The recursion
+        // identity is some object that is common to instantiations of the type with the same origin.
+        function getRecursionIdentity(type) {
+            if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
+                if (ts.getObjectFlags(type) && 4 /* Reference */ && type.node) {
+                    // Deferred type references are tracked through their associated AST node. This gives us finer
+                    // granularity than using their associated target because each manifest type reference has a
+                    // unique AST node.
+                    return type.node;
+                }
+                if (type.symbol && !(ts.getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+                    // We track all object types that have an associated symbol (representing the origin of the type), but
+                    // exclude the static side of classes from this check since it shares its symbol with the instance side.
+                    return type.symbol;
+                }
+                if (isTupleType(type)) {
+                    // Tuple types are tracked through their target type
+                    return type.target;
+                }
             }
-            return t;
+            if (type.flags & 8388608 /* IndexedAccess */) {
+                // Identity is the leftmost object type in a chain of indexed accesses, eg, in A[P][Q] it is A
+                do {
+                    type = type.objectType;
+                } while (type.flags & 8388608 /* IndexedAccess */);
+                return type;
+            }
+            if (type.flags & 16777216 /* Conditional */) {
+                // The root object represents the origin of the conditional type
+                return type.root;
+            }
+            return undefined;
         }
         function isPropertyIdenticalTo(sourceProp, targetProp) {
             return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
@@ -59149,8 +60738,8 @@ var ts;
         }
         function literalTypesWithSameBaseType(types) {
             var commonBaseType;
-            for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
-                var t = types_12[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 var baseType = getBaseTypeOfLiteralType(t);
                 if (!commonBaseType) {
                     commonBaseType = baseType;
@@ -59324,8 +60913,8 @@ var ts;
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
-            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];
                 result |= getFalsyFlags(t);
             }
             return result;
@@ -59355,7 +60944,7 @@ var ts;
                     type.flags & 64 /* BigInt */ ? zeroBigIntType :
                         type === regularFalseType ||
                             type === falseType ||
-                            type.flags & (16384 /* Void */ | 32768 /* Undefined */ | 65536 /* Null */) ||
+                            type.flags & (16384 /* Void */ | 32768 /* Undefined */ | 65536 /* Null */ | 3 /* AnyOrUnknown */) ||
                             type.flags & 128 /* StringLiteral */ && type.value === "" ||
                             type.flags & 256 /* NumberLiteral */ && type.value === 0 ||
                             type.flags & 2048 /* BigIntLiteral */ && isZeroBigInt(type) ? type :
@@ -59658,12 +61247,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 213 /* BinaryExpression */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 216 /* BinaryExpression */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* 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 159 /* Parameter */:
+                case 160 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -59678,23 +61267,23 @@ 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 195 /* BindingElement */:
+                case 198 /* 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 304 /* JSDocFunctionType */:
+                case 308 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 248 /* FunctionDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 251 /* FunctionDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
                         if (wideningKind === 3 /* GeneratorYield */) {
                             error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
@@ -59708,7 +61297,7 @@ var ts;
                         wideningKind === 3 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
                             ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 189 /* MappedType */:
+                case 190 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -59838,7 +61427,7 @@ var ts;
             if (objectFlags & 67108864 /* CouldContainTypeVariablesComputed */) {
                 return !!(objectFlags & 134217728 /* CouldContainTypeVariables */);
             }
-            var result = !!(type.flags & 63176704 /* Instantiable */ ||
+            var result = !!(type.flags & 465829888 /* Instantiable */ ||
                 type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || ts.forEach(getTypeArguments(type), couldContainTypeVariables)) ||
                     objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                     objectFlags & (32 /* Mapped */ | 131072 /* ObjectRestType */)) ||
@@ -59850,16 +61439,15 @@ var ts;
         }
         function isNonGenericTopLevelType(type) {
             if (type.aliasSymbol && !type.aliasTypeArguments) {
-                var declaration = ts.getDeclarationOfKind(type.aliasSymbol, 251 /* TypeAliasDeclaration */);
-                return !!(declaration && ts.findAncestor(declaration.parent, function (n) { return n.kind === 294 /* SourceFile */ ? true : n.kind === 253 /* ModuleDeclaration */ ? false : "quit"; }));
+                var declaration = ts.getDeclarationOfKind(type.aliasSymbol, 254 /* TypeAliasDeclaration */);
+                return !!(declaration && ts.findAncestor(declaration.parent, function (n) { return n.kind === 297 /* SourceFile */ ? true : n.kind === 256 /* ModuleDeclaration */ ? false : "quit"; }));
             }
             return false;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
             return !!(type === typeParameter ||
                 type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
-                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
-                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
+                type.flags & 16777216 /* Conditional */ && (getTrueTypeFromConditionalType(type) === typeParameter || getFalseTypeFromConditionalType(type) === typeParameter));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -59906,7 +61494,8 @@ var ts;
         // arrow function, but is considered partially inferable because property 'a' has an inferable type.
         function isPartiallyInferableType(type) {
             return !(ts.getObjectFlags(type) & 2097152 /* NonInferrableType */) ||
-                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); }) ||
+                isTupleType(type) && ts.some(getTypeArguments(type), isPartiallyInferableType);
         }
         function createReverseMappedType(source, target, constraint) {
             // We consider a source type reverse mappable if it has a string index signature or if
@@ -60010,17 +61599,73 @@ var ts;
         function isFromInferenceBlockedSource(type) {
             return !!(type.symbol && ts.some(type.symbol.declarations, hasSkipDirectInferenceFlag));
         }
+        function isValidBigIntString(s) {
+            var scanner = ts.createScanner(99 /* ESNext */, /*skipTrivia*/ false);
+            var success = true;
+            scanner.setOnError(function () { return success = false; });
+            scanner.setText(s + "n");
+            var result = scanner.scan();
+            if (result === 40 /* MinusToken */) {
+                result = scanner.scan();
+            }
+            var flags = scanner.getTokenFlags();
+            // validate that
+            // * scanning proceeded without error
+            // * a bigint can be scanned, and that when it is scanned, it is
+            // * the full length of the input string (so the scanner is one character beyond the augmented input length)
+            // * it does not contain a numeric seperator (the `BigInt` constructor does not accept a numeric seperator in its input)
+            return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */);
+        }
+        function isStringLiteralTypeValueParsableAsType(s, target) {
+            if (target.flags & 1048576 /* Union */) {
+                return !!forEachType(target, function (t) { return isStringLiteralTypeValueParsableAsType(s, t); });
+            }
+            switch (target) {
+                case stringType: return true;
+                case numberType: return s.value !== "" && isFinite(+(s.value));
+                case bigintType: return s.value !== "" && isValidBigIntString(s.value);
+                // the next 4 should be handled in `getTemplateLiteralType`, as they are all exactly one value, but are here for completeness, just in case
+                // this function is ever used on types which don't come from template literal holes
+                case trueType: return s.value === "true";
+                case falseType: return s.value === "false";
+                case undefinedType: return s.value === "undefined";
+                case nullType: return s.value === "null";
+                default: return !!(target.flags & 1 /* Any */);
+            }
+        }
+        function inferLiteralsFromTemplateLiteralType(source, target) {
+            var value = source.value;
+            var texts = target.texts;
+            var lastIndex = texts.length - 1;
+            var startText = texts[0];
+            var endText = texts[lastIndex];
+            if (!(value.startsWith(startText) && value.slice(startText.length).endsWith(endText)))
+                return undefined;
+            var matches = [];
+            var str = value.slice(startText.length, value.length - endText.length);
+            var pos = 0;
+            for (var i = 1; i < lastIndex; i++) {
+                var delim = texts[i];
+                var delimPos = delim.length > 0 ? str.indexOf(delim, pos) : pos < str.length ? pos + 1 : -1;
+                if (delimPos < 0)
+                    return undefined;
+                matches.push(getLiteralType(str.slice(pos, delimPos)));
+                pos = delimPos + delim.length;
+            }
+            matches.push(getLiteralType(str.slice(pos)));
+            return matches;
+        }
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolOrTypeStack;
-            var visited;
             var bivariant = false;
             var propagationType;
             var inferencePriority = 1024 /* MaxValue */;
             var allowComplexConstraintInference = true;
-            var objectTypeComparisonDepth = 0;
-            var targetStack = [];
+            var visited;
+            var sourceStack;
+            var targetStack;
+            var expandingFlags = 0 /* None */;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
                 if (!couldContainTypeVariables(target)) {
@@ -60148,7 +61793,7 @@ var ts;
                             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 */) {
+                            if (indexType.flags & 465829888 /* Instantiable */) {
                                 var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
                                     invokeOnce(source, simplified_1, inferFromTypes);
@@ -60177,18 +61822,13 @@ var ts;
                     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 (source.flags & 268435456 /* StringMapping */ && target.flags & 268435456 /* StringMapping */) {
+                    if (source.symbol === target.symbol) {
+                        inferFromTypes(source.type, target.type);
+                    }
                 }
                 else if (target.flags & 16777216 /* Conditional */) {
-                    var savePriority = priority;
-                    priority |= contravariant ? 32 /* ContravariantConditional */ : 0;
-                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
-                    priority = savePriority;
+                    invokeOnce(source, target, inferToConditionalType);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -60201,9 +61841,12 @@ var ts;
                         inferFromTypes(sourceType, target);
                     }
                 }
+                else if (target.flags & 134217728 /* TemplateLiteral */) {
+                    inferToTemplateLiteralType(source, target);
+                }
                 else {
                     source = getReducedType(source);
-                    if (!(priority & 256 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 256 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 465829888 /* 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`
@@ -60248,7 +61891,30 @@ var ts;
                 (visited || (visited = new ts.Map())).set(key, -1 /* Circularity */);
                 var saveInferencePriority = inferencePriority;
                 inferencePriority = 1024 /* MaxValue */;
-                action(source, target);
+                // We stop inferring and report a circularity if we encounter duplicate recursion identities on both
+                // the source side and the target side.
+                var saveExpandingFlags = expandingFlags;
+                var sourceIdentity = getRecursionIdentity(source) || source;
+                var targetIdentity = getRecursionIdentity(target) || target;
+                if (sourceIdentity && ts.contains(sourceStack, sourceIdentity))
+                    expandingFlags |= 1 /* Source */;
+                if (targetIdentity && ts.contains(targetStack, targetIdentity))
+                    expandingFlags |= 2 /* Target */;
+                if (expandingFlags !== 3 /* Both */) {
+                    if (sourceIdentity)
+                        (sourceStack || (sourceStack = [])).push(sourceIdentity);
+                    if (targetIdentity)
+                        (targetStack || (targetStack = [])).push(targetIdentity);
+                    action(source, target);
+                    if (targetIdentity)
+                        targetStack.pop();
+                    if (sourceIdentity)
+                        sourceStack.pop();
+                }
+                else {
+                    inferencePriority = -1 /* Circularity */;
+                }
+                expandingFlags = saveExpandingFlags;
                 visited.set(key, inferencePriority);
                 inferencePriority = Math.min(inferencePriority, saveInferencePriority);
             }
@@ -60305,8 +61971,8 @@ var ts;
             }
             function getSingleTypeVariableFromIntersectionTypes(types) {
                 var typeVariable;
-                for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                    var type = types_14[_i];
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var type = types_15[_i];
                     var t = type.flags & 2097152 /* Intersection */ && ts.find(type.types, function (t) { return !!getInferenceInfoForType(t); });
                     if (!t || typeVariable && t !== typeVariable) {
                         return undefined;
@@ -60444,40 +62110,31 @@ var ts;
                 }
                 return false;
             }
-            function inferFromObjectTypes(source, target) {
-                // 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 symbolOrType = ts.getObjectFlags(target) & 4 /* Reference */ && target.node ? getNormalizedType(target, /*writing*/ false) : isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
-                if (symbolOrType) {
-                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
-                        if (ts.getObjectFlags(target) & 4 /* Reference */ && target.node) {
-                            // Don't set the circularity flag for re-encountered recursive type references just because we're already exploring them
-                            return;
-                        }
-                        inferencePriority = -1 /* Circularity */;
-                        return;
-                    }
-                    targetStack[objectTypeComparisonDepth] = target;
-                    objectTypeComparisonDepth++;
-                    if (isDeeplyNestedType(target, targetStack, objectTypeComparisonDepth)) {
-                        inferencePriority = -1 /* Circularity */;
-                        objectTypeComparisonDepth--;
-                        return;
-                    }
-                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
-                    inferFromObjectTypesWorker(source, target);
-                    symbolOrTypeStack.pop();
-                    objectTypeComparisonDepth--;
+            function inferToConditionalType(source, target) {
+                if (source.flags & 16777216 /* Conditional */) {
+                    inferFromTypes(source.checkType, target.checkType);
+                    inferFromTypes(source.extendsType, target.extendsType);
+                    inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
+                    inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
                 else {
-                    inferFromObjectTypesWorker(source, target);
+                    var savePriority = priority;
+                    priority |= contravariant ? 32 /* ContravariantConditional */ : 0;
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    priority = savePriority;
                 }
             }
-            function inferFromObjectTypesWorker(source, target) {
+            function inferToTemplateLiteralType(source, target) {
+                var matches = source.flags & 128 /* StringLiteral */ ? inferLiteralsFromTemplateLiteralType(source, target) :
+                    source.flags & 134217728 /* TemplateLiteral */ && ts.arraysEqual(source.texts, target.texts) ? source.types :
+                        undefined;
+                var types = target.types;
+                for (var i = 0; i < types.length; i++) {
+                    inferFromTypes(matches ? matches[i] : neverType, types[i]);
+                }
+            }
+            function inferFromObjectTypes(source, target) {
                 if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
                     inferFromTypeArguments(getTypeArguments(source), getTypeArguments(target), getVariances(source.target));
@@ -60488,8 +62145,12 @@ var ts;
                     // from S to T and from X to Y.
                     inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
                     inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                    var sourceNameType = getNameTypeFromMappedType(source);
+                    var targetNameType = getNameTypeFromMappedType(target);
+                    if (sourceNameType && targetNameType)
+                        inferFromTypes(sourceNameType, targetNameType);
                 }
-                if (ts.getObjectFlags(target) & 32 /* Mapped */) {
+                if (ts.getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
                     var constraintType = getConstraintTypeFromMappedType(target);
                     if (inferToMappedType(source, target, constraintType)) {
                         return;
@@ -60597,7 +62258,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 === 164 /* MethodDeclaration */ || kind === 163 /* MethodSignature */ || kind === 165 /* Constructor */;
+                    bivariant = bivariant || kind === 165 /* MethodDeclaration */ || kind === 164 /* MethodSignature */ || kind === 166 /* Constructor */;
                     applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
@@ -60632,7 +62293,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return !!constraint && maybeTypeOfKind(constraint.flags & 16777216 /* Conditional */ ? getDefaultConstraintOfConditionalType(constraint) : constraint, 131068 /* Primitive */ | 4194304 /* Index */);
+            return !!constraint && maybeTypeOfKind(constraint.flags & 16777216 /* Conditional */ ? getDefaultConstraintOfConditionalType(constraint) : constraint, 131068 /* Primitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */);
         }
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
@@ -60741,22 +62402,22 @@ var ts;
                     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 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;
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_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_save_dev_types_Slashjquery;
                 case "describe":
                 case "suite":
                 case "it":
                 case "test":
                     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;
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_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_save_dev_types_Slashjest_or_npm_i_save_dev_types_Slashmocha;
                 case "process":
                 case "require":
                 case "Buffer":
                 case "module":
                     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;
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_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_save_dev_types_Slashnode;
                 case "Map":
                 case "Set":
                 case "Promise":
@@ -60765,9 +62426,19 @@ var ts;
                 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;
+                case "SharedArrayBuffer":
+                case "Atomics":
+                case "AsyncIterable":
+                case "AsyncIterableIterator":
+                case "AsyncGenerator":
+                case "AsyncGeneratorFunction":
+                case "BigInt":
+                case "Reflect":
+                case "BigInt64Array":
+                case "BigUint64Array":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_1_or_later;
                 default:
-                    if (node.parent.kind === 286 /* ShorthandPropertyAssignment */) {
+                    if (node.parent.kind === 289 /* ShorthandPropertyAssignment */) {
                         return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
                     }
                     else {
@@ -60788,7 +62459,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 === 175 /* TypeQuery */ ? true : n.kind === 78 /* Identifier */ || n.kind === 156 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 176 /* TypeQuery */ ? true : n.kind === 78 /* Identifier */ || n.kind === 157 /* 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
@@ -60803,11 +62474,11 @@ var ts;
                     return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
                 case 107 /* ThisKeyword */:
                     return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
-                case 222 /* NonNullExpression */:
-                case 204 /* ParenthesizedExpression */:
+                case 225 /* NonNullExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
                         var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
@@ -60818,26 +62489,28 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 204 /* ParenthesizedExpression */:
-                case 222 /* NonNullExpression */:
+                case 207 /* ParenthesizedExpression */:
+                case 225 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
-                case 213 /* BinaryExpression */:
-                    return ts.isAssignmentExpression(target) && isMatchingReference(source, target.left);
+                case 216 /* BinaryExpression */:
+                    return (ts.isAssignmentExpression(target) && isMatchingReference(source, target.left)) ||
+                        (ts.isBinaryExpression(target) && target.operatorToken.kind === 27 /* CommaToken */ && isMatchingReference(source, target.right));
             }
             switch (source.kind) {
                 case 78 /* Identifier */:
+                case 79 /* PrivateIdentifier */:
                     return target.kind === 78 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 246 /* VariableDeclaration */ || target.kind === 195 /* BindingElement */) &&
+                        (target.kind === 249 /* VariableDeclaration */ || target.kind === 198 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 107 /* ThisKeyword */:
                     return target.kind === 107 /* ThisKeyword */;
                 case 105 /* SuperKeyword */:
                     return target.kind === 105 /* SuperKeyword */;
-                case 222 /* NonNullExpression */:
-                case 204 /* ParenthesizedExpression */:
+                case 225 /* NonNullExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -60847,11 +62520,11 @@ var ts;
         // Given a source x, check if target matches x or is an && operation with an operand that matches x.
         function containsTruthyCheck(source, target) {
             return isMatchingReference(source, target) ||
-                (target.kind === 213 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                (target.kind === 216 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
                     (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 198 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 201 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -60880,7 +62553,7 @@ var ts;
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
                             (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
-                                !maybeTypeOfKind(getTypeOfSymbol(prop), 63176704 /* Instantiable */);
+                                !maybeTypeOfKind(getTypeOfSymbol(prop), 465829888 /* Instantiable */);
                     }
                     return !!prop.isDiscriminantProperty;
                 }
@@ -60913,7 +62586,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 198 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 201 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -60962,8 +62635,8 @@ var ts;
         }
         function getTypeFactsOfTypes(types) {
             var result = 0 /* None */;
-            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];
                 result |= getTypeFacts(t);
             }
             return result;
@@ -61034,7 +62707,7 @@ var ts;
             if (flags & 131072 /* Never */) {
                 return 0 /* None */;
             }
-            if (flags & 63176704 /* Instantiable */) {
+            if (flags & 465829888 /* Instantiable */) {
                 return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
@@ -61058,28 +62731,35 @@ var ts;
                 return errorType;
             var text = getPropertyNameFromType(nameType);
             return getConstraintForLocation(getTypeOfPropertyOfType(type, text), name) ||
-                isNumericLiteralName(text) && getIndexTypeOfType(type, 1 /* Number */) ||
-                getIndexTypeOfType(type, 0 /* String */) ||
+                isNumericLiteralName(text) && includeUndefinedInIndexSignature(getIndexTypeOfType(type, 1 /* Number */)) ||
+                includeUndefinedInIndexSignature(getIndexTypeOfType(type, 0 /* String */)) ||
                 errorType;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
+                includeUndefinedInIndexSignature(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined)) ||
                 errorType;
         }
+        function includeUndefinedInIndexSignature(type) {
+            if (!type)
+                return type;
+            return compilerOptions.noUncheckedIndexedAccess ?
+                getUnionType([type, undefinedType]) :
+                type;
+        }
         function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 196 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 285 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 199 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 288 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 213 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 236 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 216 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 239 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -61096,21 +62776,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return stringType;
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent) || errorType;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 207 /* DeleteExpression */:
+                case 210 /* DeleteExpression */:
                     return undefinedType;
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 217 /* SpreadElement */:
+                case 220 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -61118,7 +62798,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 193 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 196 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -61136,30 +62816,30 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 235 /* ForInStatement */) {
+            if (node.parent.parent.kind === 238 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 236 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 239 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 246 /* VariableDeclaration */ ?
+            return node.kind === 249 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 246 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 249 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 195 /* BindingElement */ && node.parent.kind === 213 /* BinaryExpression */ &&
+                node.kind !== 198 /* BindingElement */ && node.parent.kind === 216 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                         case 74 /* BarBarEqualsToken */:
@@ -61174,13 +62854,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 204 /* ParenthesizedExpression */ ||
-                parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 207 /* ParenthesizedExpression */ ||
+                parent.kind === 216 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 216 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 281 /* CaseClause */) {
+            if (clause.kind === 284 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -61200,7 +62880,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 281 /* CaseClause */) {
+                if (clause.kind === 284 /* CaseClause */) {
                     if (ts.isStringLiteralLike(clause.expression)) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -61337,8 +63017,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
-                var t = types_16[_i];
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var t = types_17[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -61362,12 +63042,12 @@ var ts;
             var root = getReferenceRoot(node);
             var parent = root.parent;
             var isLengthPushOrUnshift = ts.isPropertyAccessExpression(parent) && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 200 /* CallExpression */
+                parent.parent.kind === 203 /* CallExpression */
                     && ts.isIdentifier(parent.name)
                     && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 199 /* ElementAccessExpression */ &&
+            var isElementAssignment = parent.kind === 202 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 213 /* BinaryExpression */ &&
+                parent.parent.kind === 216 /* BinaryExpression */ &&
                 parent.parent.operatorToken.kind === 62 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
@@ -61375,8 +63055,8 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return (declaration.kind === 246 /* VariableDeclaration */ || declaration.kind === 159 /* Parameter */ ||
-                declaration.kind === 162 /* PropertyDeclaration */ || declaration.kind === 161 /* PropertySignature */) &&
+            return (declaration.kind === 249 /* VariableDeclaration */ || declaration.kind === 160 /* Parameter */ ||
+                declaration.kind === 163 /* PropertyDeclaration */ || declaration.kind === 162 /* PropertySignature */) &&
                 !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
@@ -61384,12 +63064,18 @@ var ts;
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
+                if (ts.getCheckFlags(symbol) & 262144 /* Mapped */) {
+                    var origin = symbol.syntheticOrigin;
+                    if (origin && getExplicitTypeOfSymbol(origin)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                }
                 var declaration = symbol.valueDeclaration;
                 if (declaration) {
                     if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
                         return getTypeOfSymbol(symbol);
                     }
-                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 236 /* ForOfStatement */) {
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 239 /* ForOfStatement */) {
                         var statement = declaration.parent.parent;
                         var expressionType = getTypeOfDottedName(statement.expression, /*diagnostic*/ undefined);
                         if (expressionType) {
@@ -61417,11 +63103,11 @@ var ts;
                         return getExplicitThisType(node);
                     case 105 /* SuperKeyword */:
                         return checkSuperExpression(node);
-                    case 198 /* PropertyAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         var prop = type && getPropertyOfType(type, node.name.escapedText);
                         return prop && getExplicitTypeOfSymbol(prop, diagnostic);
-                    case 204 /* ParenthesizedExpression */:
+                    case 207 /* ParenthesizedExpression */:
                         return getTypeOfDottedName(node.expression, diagnostic);
                 }
             }
@@ -61435,7 +63121,7 @@ var ts;
                 // circularities in control flow analysis, we use getTypeOfDottedName when resolving the call
                 // target expression of an assertion.
                 var funcType = void 0;
-                if (node.parent.kind === 230 /* ExpressionStatement */) {
+                if (node.parent.kind === 233 /* ExpressionStatement */) {
                     funcType = getTypeOfDottedName(node.expression, /*diagnostic*/ undefined);
                 }
                 else if (node.expression.kind !== 105 /* SuperKeyword */) {
@@ -61479,7 +63165,7 @@ var ts;
         }
         function isFalseExpression(expr) {
             var node = ts.skipParentheses(expr);
-            return node.kind === 94 /* FalseKeyword */ || node.kind === 213 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (isFalseExpression(node.left) || isFalseExpression(node.right)) ||
+            return node.kind === 94 /* FalseKeyword */ || node.kind === 216 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (isFalseExpression(node.left) || isFalseExpression(node.right)) ||
                 node.operatorToken.kind === 56 /* BarBarToken */ && isFalseExpression(node.left) && isFalseExpression(node.right));
         }
         function isReachableFlowNodeWorker(flow, noCacheCheck) {
@@ -61598,7 +63284,7 @@ var ts;
             if (flowAnalysisDisabled) {
                 return errorType;
             }
-            if (!reference.flowNode || !couldBeUninitialized && !(declaredType.flags & 133970943 /* Narrowable */)) {
+            if (!reference.flowNode || !couldBeUninitialized && !(declaredType.flags & 536624127 /* Narrowable */)) {
                 return declaredType;
             }
             flowInvocationCount++;
@@ -61610,7 +63296,7 @@ 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 (resultType === unreachableNeverType || reference.parent && reference.parent.kind === 222 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (resultType === unreachableNeverType || reference.parent && reference.parent.kind === 225 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
@@ -61625,6 +63311,7 @@ var ts;
                 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.
+                    ts.tracing.instant("check" /* Check */, "getTypeAtFlowNode_DepthLimit", { flowId: flow.id });
                     flowAnalysisDisabled = true;
                     reportFlowControlError(reference);
                     return errorType;
@@ -61691,8 +63378,8 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.node;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 198 /* PropertyAccessExpression */ &&
-                            reference.kind !== 199 /* ElementAccessExpression */ &&
+                            reference.kind !== 201 /* PropertyAccessExpression */ &&
+                            reference.kind !== 202 /* ElementAccessExpression */ &&
                             reference.kind !== 107 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
@@ -61717,7 +63404,7 @@ var ts;
             }
             function getInitialOrAssignedType(flow) {
                 var node = flow.node;
-                return getConstraintForLocation(node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */ ?
+                return getConstraintForLocation(node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */ ?
                     getInitialType(node) :
                     getAssignedType(node), reference);
             }
@@ -61757,14 +63444,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 === 205 /* FunctionExpression */ || init.kind === 206 /* ArrowFunction */)) {
+                        if (init && (init.kind === 208 /* FunctionExpression */ || init.kind === 209 /* 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 === 235 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 238 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -61775,7 +63462,7 @@ var ts;
                 if (node.kind === 94 /* FalseKeyword */) {
                     return unreachableNeverType;
                 }
-                if (node.kind === 213 /* BinaryExpression */) {
+                if (node.kind === 216 /* BinaryExpression */) {
                     if (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */) {
                         return narrowTypeByAssertion(narrowTypeByAssertion(type, node.left), node.right);
                     }
@@ -61806,7 +63493,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 200 /* CallExpression */ ?
+                    var expr = node.kind === 203 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -61814,7 +63501,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 200 /* CallExpression */) {
+                            if (node.kind === 203 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -61862,7 +63549,7 @@ var ts;
                 if (isMatchingReference(reference, expr)) {
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
-                else if (expr.kind === 208 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 211 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
@@ -61870,7 +63557,7 @@ var ts;
                         if (optionalChainContainsReference(expr, reference)) {
                             type = narrowTypeBySwitchOptionalChainContainment(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd, function (t) { return !(t.flags & (32768 /* Undefined */ | 131072 /* Never */)); });
                         }
-                        else if (expr.kind === 208 /* TypeOfExpression */ && optionalChainContainsReference(expr.expression, reference)) {
+                        else if (expr.kind === 211 /* TypeOfExpression */ && optionalChainContainsReference(expr.expression, reference)) {
                             type = narrowTypeBySwitchOptionalChainContainment(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd, function (t) { return !(t.flags & 131072 /* Never */ || t.flags & 128 /* StringLiteral */ && t.value === "undefined"); });
                         }
                     }
@@ -62088,10 +63775,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 === 208 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 211 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 208 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 211 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -62211,7 +63898,7 @@ var ts;
                 if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
                     // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
                     // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
-                    if (typeOfExpr.parent.parent.kind === 213 /* BinaryExpression */) {
+                    if (typeOfExpr.parent.parent.kind === 216 /* BinaryExpression */) {
                         var expr = typeOfExpr.parent.parent;
                         if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
                             return nonPrimitiveType;
@@ -62294,7 +63981,7 @@ var ts;
                     if (isTypeSubtypeOf(candidate, type)) {
                         return candidate;
                     }
-                    if (type.flags & 63176704 /* Instantiable */) {
+                    if (type.flags & 465829888 /* Instantiable */) {
                         var constraint = getBaseConstraintOfType(type) || anyType;
                         if (isTypeSubtypeOf(candidate, constraint)) {
                             return getIntersectionType([type, candidate]);
@@ -62459,15 +64146,10 @@ var ts;
                         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]);
+                // If the candidate type is a subtype of the target type, narrow to the candidate type,
+                // if the target type is a subtype of the candidate type, narrow to the target type,
+                // otherwise, narrow to an intersection of the two types.
+                return isTypeSubtypeOf(candidate, type) ? candidate : isTypeSubtypeOf(type, candidate) ? type : getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {
@@ -62510,16 +64192,17 @@ var ts;
                     case 78 /* Identifier */:
                     case 107 /* ThisKeyword */:
                     case 105 /* SuperKeyword */:
-                    case 198 /* PropertyAccessExpression */:
-                    case 199 /* ElementAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 200 /* CallExpression */:
+                    case 203 /* CallExpression */:
                         return narrowTypeByCallExpression(type, expr, assumeTrue);
-                    case 204 /* ParenthesizedExpression */:
+                    case 207 /* ParenthesizedExpression */:
+                    case 225 /* NonNullExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 213 /* BinaryExpression */:
+                    case 216 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 211 /* PrefixUnaryExpression */:
+                    case 214 /* PrefixUnaryExpression */:
                         if (expr.operator === 53 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -62564,9 +64247,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 254 /* ModuleBlock */ ||
-                    node.kind === 294 /* SourceFile */ ||
-                    node.kind === 162 /* PropertyDeclaration */;
+                    node.kind === 257 /* ModuleBlock */ ||
+                    node.kind === 297 /* SourceFile */ ||
+                    node.kind === 163 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -62588,7 +64271,7 @@ var ts;
             if (node.kind === 78 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 159 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 160 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -62604,7 +64287,7 @@ var ts;
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             if (pushTypeResolution(declaration.symbol, 2 /* DeclaredType */)) {
                 var annotationIncludesUndefined = strictNullChecks &&
-                    declaration.kind === 159 /* Parameter */ &&
+                    declaration.kind === 160 /* Parameter */ &&
                     declaration.initializer &&
                     getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                     !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -62618,10 +64301,10 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 198 /* PropertyAccessExpression */ ||
-                parent.kind === 200 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 199 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 195 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 201 /* PropertyAccessExpression */ ||
+                parent.kind === 203 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 202 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 198 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
             return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
@@ -62663,7 +64346,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 206 /* ArrowFunction */) {
+                    if (container.kind === 209 /* 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.hasSyntacticModifier(container, 256 /* Async */)) {
@@ -62679,16 +64362,16 @@ var ts;
                 markAliasReferenced(symbol, node);
             }
             var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
-            var declaration = localOrExportSymbol.valueDeclaration;
-            if (declaration && ts.getCombinedNodeFlags(declaration) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node.parent, localOrExportSymbol)) {
+            var sourceSymbol = localOrExportSymbol.flags & 2097152 /* Alias */ ? resolveAlias(localOrExportSymbol) : localOrExportSymbol;
+            if (getDeclarationNodeFlagsFromSymbol(sourceSymbol) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node.parent, sourceSymbol)) {
                 errorOrSuggestion(/* isError */ false, node, ts.Diagnostics._0_is_deprecated, node.escapedText);
-                ;
             }
+            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 === 249 /* ClassDeclaration */
+                if (declaration.kind === 252 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -62700,14 +64383,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 218 /* ClassExpression */) {
+                else if (declaration.kind === 221 /* 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 !== 294 /* SourceFile */) {
+                    while (container.kind !== 297 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 162 /* PropertyDeclaration */ && ts.hasSyntacticModifier(container, 32 /* Static */)) {
+                            if (container.kind === 163 /* PropertyDeclaration */ && ts.hasSyntacticModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -62756,7 +64439,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 === 159 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 160 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -62765,8 +64448,8 @@ 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 === 205 /* FunctionExpression */ ||
-                flowContainer.kind === 206 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 208 /* FunctionExpression */ ||
+                flowContainer.kind === 209 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -62775,9 +64458,9 @@ var ts;
             // declaration container are the same).
             var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */)) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 267 /* ExportSpecifier */) ||
-                node.parent.kind === 222 /* NonNullExpression */ ||
-                declaration.kind === 246 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 270 /* ExportSpecifier */) ||
+                node.parent.kind === 225 /* NonNullExpression */ ||
+                declaration.kind === 249 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 8388608 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -62812,7 +64495,7 @@ var ts;
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
                 ts.isSourceFile(symbol.valueDeclaration) ||
-                symbol.valueDeclaration.parent.kind === 284 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 287 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -62835,7 +64518,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container)) {
-                        var varDeclList = ts.getAncestor(symbol.valueDeclaration, 247 /* VariableDeclarationList */);
+                        var varDeclList = ts.getAncestor(symbol.valueDeclaration, 250 /* VariableDeclarationList */);
                         if (varDeclList && varDeclList.parent === container) {
                             var part = getPartOfForStatementContainingNode(node.parent, container);
                             if (part) {
@@ -62856,7 +64539,7 @@ 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 (ts.isForStatement(container)) {
-                    var varDeclList = ts.getAncestor(symbol.valueDeclaration, 247 /* VariableDeclarationList */);
+                    var varDeclList = ts.getAncestor(symbol.valueDeclaration, 250 /* VariableDeclarationList */);
                     if (varDeclList && varDeclList.parent === container && isAssignedInBodyOfForStatement(node, container)) {
                         getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                     }
@@ -62875,7 +64558,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 204 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 207 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -62883,7 +64566,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 211 /* PrefixUnaryExpression */ || current.parent.kind === 212 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 214 /* PrefixUnaryExpression */ || current.parent.kind === 215 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 45 /* PlusPlusToken */ || expr.operator === 46 /* MinusMinusToken */;
             }
@@ -62896,7 +64579,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 162 /* PropertyDeclaration */ || container.kind === 165 /* Constructor */) {
+            if (container.kind === 163 /* PropertyDeclaration */ || container.kind === 166 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -62936,37 +64619,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 165 /* Constructor */) {
+            if (container.kind === 166 /* 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 === 206 /* ArrowFunction */) {
+            if (container.kind === 209 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 253 /* ModuleDeclaration */:
+                case 256 /* 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 252 /* EnumDeclaration */:
+                case 255 /* 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 165 /* Constructor */:
+                case 166 /* 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 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
                     if (ts.hasSyntacticModifier(container, 32 /* Static */) && !(compilerOptions.target === 99 /* ESNext */ && compilerOptions.useDefineForClassFields)) {
                         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 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -63054,7 +64737,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 205 /* FunctionExpression */ &&
+            if (container.kind === 208 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -63064,16 +64747,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 164 /* MethodDeclaration */ &&
-                container.parent.kind === 197 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 165 /* MethodDeclaration */ &&
+                container.parent.kind === 200 /* 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 === 205 /* FunctionExpression */ &&
-                container.parent.kind === 285 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 197 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 208 /* FunctionExpression */ &&
+                container.parent.kind === 288 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 200 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -63081,7 +64764,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 === 205 /* FunctionExpression */ &&
+            else if (container.kind === 208 /* 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") &&
@@ -63106,7 +64789,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 304 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 308 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -63120,16 +64803,16 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 159 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 160 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 200 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 203 /* CallExpression */ && node.parent.expression === node;
             var immediateContainer = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var container = immediateContainer;
             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 === 206 /* ArrowFunction */) {
+                while (container && container.kind === 209 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -63142,14 +64825,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 157 /* ComputedPropertyName */; });
-                if (current && current.kind === 157 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 158 /* ComputedPropertyName */; });
+                if (current && current.kind === 158 /* 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 === 197 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 200 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -63157,7 +64840,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && immediateContainer.kind === 165 /* Constructor */) {
+            if (!isCallExpression && immediateContainer.kind === 166 /* 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.hasSyntacticModifier(container, 32 /* Static */) || isCallExpression) {
@@ -63226,7 +64909,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 === 164 /* MethodDeclaration */ && ts.hasSyntacticModifier(container, 256 /* Async */)) {
+            if (container.kind === 165 /* MethodDeclaration */ && ts.hasSyntacticModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -63240,7 +64923,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 197 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 200 /* 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;
@@ -63261,7 +64944,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 165 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 166 /* 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;
@@ -63276,7 +64959,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 === 165 /* Constructor */;
+                    return container.kind === 166 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -63284,21 +64967,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 === 197 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 200 /* ObjectLiteralExpression */) {
                         if (ts.hasSyntacticModifier(container, 32 /* Static */)) {
-                            return container.kind === 164 /* MethodDeclaration */ ||
-                                container.kind === 163 /* MethodSignature */ ||
-                                container.kind === 166 /* GetAccessor */ ||
-                                container.kind === 167 /* SetAccessor */;
+                            return container.kind === 165 /* MethodDeclaration */ ||
+                                container.kind === 164 /* MethodSignature */ ||
+                                container.kind === 167 /* GetAccessor */ ||
+                                container.kind === 168 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 164 /* MethodDeclaration */ ||
-                                container.kind === 163 /* MethodSignature */ ||
-                                container.kind === 166 /* GetAccessor */ ||
-                                container.kind === 167 /* SetAccessor */ ||
-                                container.kind === 162 /* PropertyDeclaration */ ||
-                                container.kind === 161 /* PropertySignature */ ||
-                                container.kind === 165 /* Constructor */;
+                            return container.kind === 165 /* MethodDeclaration */ ||
+                                container.kind === 164 /* MethodSignature */ ||
+                                container.kind === 167 /* GetAccessor */ ||
+                                container.kind === 168 /* SetAccessor */ ||
+                                container.kind === 163 /* PropertyDeclaration */ ||
+                                container.kind === 162 /* PropertySignature */ ||
+                                container.kind === 166 /* Constructor */;
                         }
                     }
                 }
@@ -63306,10 +64989,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 164 /* MethodDeclaration */ ||
-                func.kind === 166 /* GetAccessor */ ||
-                func.kind === 167 /* SetAccessor */) && func.parent.kind === 197 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 205 /* FunctionExpression */ && func.parent.kind === 285 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 165 /* MethodDeclaration */ ||
+                func.kind === 167 /* GetAccessor */ ||
+                func.kind === 168 /* SetAccessor */) && func.parent.kind === 200 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 208 /* FunctionExpression */ && func.parent.kind === 288 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -63321,7 +65004,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 206 /* ArrowFunction */) {
+            if (func.kind === 209 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -63348,7 +65031,7 @@ var ts;
                         if (thisType) {
                             return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 285 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 288 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -63362,7 +65045,7 @@ var ts;
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = ts.walkUpParenthesizedExpressions(func.parent);
-                if (parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) {
+                if (parent.kind === 216 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) {
                     var target = parent.left;
                     if (ts.isAccessExpression(target)) {
                         var expression = target.expression;
@@ -63415,25 +65098,41 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return getContextuallyTypedParameterType(declaration);
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
-                // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
+                case 163 /* PropertyDeclaration */:
+                    if (ts.hasSyntacticModifier(declaration, 32 /* Static */)) {
+                        return getContextualTypeForStaticPropertyDeclaration(declaration);
+                    }
+                // By default, do nothing and return undefined - only the above cases have context implied by a parent
             }
         }
         function getContextualTypeForBindingElement(declaration) {
             var parent = declaration.parent.parent;
             var name = declaration.propertyName || declaration.name;
             var parentType = getContextualTypeForVariableLikeDeclaration(parent) ||
-                parent.kind !== 195 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent);
-            if (parentType && !ts.isBindingPattern(name) && !ts.isComputedNonLiteralName(name)) {
-                var nameType = getLiteralTypeFromPropertyName(name);
-                if (isTypeUsableAsPropertyName(nameType)) {
-                    var text = getPropertyNameFromType(nameType);
-                    return getTypeOfPropertyOfType(parentType, text);
-                }
+                parent.kind !== 198 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent);
+            if (!parentType || ts.isBindingPattern(name) || ts.isComputedNonLiteralName(name))
+                return undefined;
+            if (parent.name.kind === 197 /* ArrayBindingPattern */) {
+                var index = ts.indexOfNode(declaration.parent.elements, declaration);
+                if (index < 0)
+                    return undefined;
+                return getContextualTypeForElementExpression(parentType, index);
             }
+            var nameType = getLiteralTypeFromPropertyName(name);
+            if (isTypeUsableAsPropertyName(nameType)) {
+                var text = getPropertyNameFromType(nameType);
+                return getTypeOfPropertyOfType(parentType, text);
+            }
+        }
+        function getContextualTypeForStaticPropertyDeclaration(declaration) {
+            var parentType = ts.isExpression(declaration.parent) && getContextualType(declaration.parent);
+            if (!parentType)
+                return undefined;
+            return getTypeOfPropertyOfContextualType(parentType, getSymbolOfNode(declaration).escapedName);
         }
         // 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.
@@ -63554,7 +65253,7 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 202 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 205 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -63567,14 +65266,7 @@ var ts;
                 case 75 /* AmpersandAmpersandEqualsToken */:
                 case 74 /* BarBarEqualsToken */:
                 case 76 /* QuestionQuestionEqualsToken */:
-                    if (node !== right) {
-                        return undefined;
-                    }
-                    var contextSensitive = getIsContextSensitiveAssignmentOrContextType(binaryExpression);
-                    if (!contextSensitive) {
-                        return undefined;
-                    }
-                    return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
+                    return node === right ? getContextualTypeForAssignmentDeclaration(binaryExpression) : undefined;
                 case 56 /* BarBarToken */:
                 case 60 /* QuestionQuestionToken */:
                     // When an || expression has a contextual type, the operands are contextually typed by that type, except
@@ -63594,24 +65286,27 @@ var ts;
         }
         // 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) {
+        function getContextualTypeForAssignmentDeclaration(binaryExpression) {
             var kind = ts.getAssignmentDeclarationKind(binaryExpression);
             switch (kind) {
                 case 0 /* None */:
-                    return true;
+                    return getTypeOfExpression(binaryExpression.left);
                 case 5 /* Property */:
                 case 1 /* ExportsProperty */:
                 case 6 /* Prototype */:
                 case 3 /* PrototypeProperty */:
+                    if (isPossiblyAliasedThisProperty(binaryExpression, kind)) {
+                        return getContextualTypeForThisPropertyAssignment(binaryExpression, kind);
+                    }
                     // 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 if (!binaryExpression.left.symbol) {
+                        return getTypeOfExpression(binaryExpression.left);
                     }
                     else {
                         var decl = binaryExpression.left.symbol.valueDeclaration;
                         if (!decl) {
-                            return false;
+                            return undefined;
                         }
                         var lhs = ts.cast(binaryExpression.left, ts.isAccessExpression);
                         var overallAnnotation = ts.getEffectiveTypeAnnotationNode(decl);
@@ -63624,39 +65319,19 @@ var ts;
                             if (parentSymbol) {
                                 var annotated = parentSymbol.valueDeclaration && ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration);
                                 if (annotated) {
-                                    var nameStr_1 = ts.getElementOrPropertyAccessName(lhs);
-                                    if (nameStr_1 !== undefined) {
-                                        var type = getTypeOfPropertyOfContextualType(getTypeFromTypeNode(annotated), nameStr_1);
-                                        return type || false;
+                                    var nameStr = ts.getElementOrPropertyAccessName(lhs);
+                                    if (nameStr !== undefined) {
+                                        return getTypeOfPropertyOfContextualType(getTypeFromTypeNode(annotated), nameStr);
                                     }
                                 }
-                                return false;
+                                return undefined;
                             }
                         }
-                        return !ts.isInJSFile(decl);
+                        return ts.isInJSFile(decl) ? undefined : getTypeOfExpression(binaryExpression.left);
                     }
                 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 = ts.cast(binaryExpression.left, ts.isAccessExpression);
-                    if (!ts.isObjectLiteralMethod(ts.getThisContainer(thisAccess.expression, /*includeArrowFunctions*/ false))) {
-                        return false;
-                    }
-                    var thisType = checkThisExpression(thisAccess.expression);
-                    var nameStr = ts.getElementOrPropertyAccessName(thisAccess);
-                    return nameStr !== undefined && thisType && getTypeOfPropertyOfContextualType(thisType, nameStr) || false;
+                    return getContextualTypeForThisPropertyAssignment(binaryExpression, kind);
                 case 7 /* ObjectDefinePropertyValue */:
                 case 8 /* ObjectDefinePropertyExports */:
                 case 9 /* ObjectDefinePrototypeProperty */:
@@ -63665,6 +65340,40 @@ var ts;
                     return ts.Debug.assertNever(kind);
             }
         }
+        function isPossiblyAliasedThisProperty(declaration, kind) {
+            if (kind === void 0) { kind = ts.getAssignmentDeclarationKind(declaration); }
+            if (kind === 4 /* ThisProperty */) {
+                return true;
+            }
+            if (!ts.isInJSFile(declaration) || kind !== 5 /* Property */ || !ts.isIdentifier(declaration.left.expression)) {
+                return false;
+            }
+            var name = declaration.left.expression.escapedText;
+            var symbol = resolveName(declaration.left, name, 111551 /* Value */, undefined, undefined, /*isUse*/ true, /*excludeGlobals*/ true);
+            return ts.isThisInitializedDeclaration(symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration);
+        }
+        function getContextualTypeForThisPropertyAssignment(binaryExpression, kind) {
+            if (!binaryExpression.symbol)
+                return getTypeOfExpression(binaryExpression.left);
+            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 undefined;
+            var thisAccess = ts.cast(binaryExpression.left, ts.isAccessExpression);
+            if (!ts.isObjectLiteralMethod(ts.getThisContainer(thisAccess.expression, /*includeArrowFunctions*/ false))) {
+                return undefined;
+            }
+            var thisType = checkThisExpression(thisAccess.expression);
+            var nameStr = ts.getElementOrPropertyAccessName(thisAccess);
+            return nameStr !== undefined && getTypeOfPropertyOfContextualType(thisType, nameStr) || undefined;
+        }
         function isCircularMappedProperty(symbol) {
             return !!(ts.getCheckFlags(symbol) & 262144 /* Mapped */ && !symbol.type && findResolutionCycleStartIndex(symbol, 0 /* Type */) >= 0);
         }
@@ -63734,7 +65443,8 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
+                || mapType(arrayContextualType, function (t) { return getIteratedTypeOrElementType(1 /* Element */, t, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false); }, 
+                /*noReductions*/ true));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
         function getContextualTypeForConditionalOperand(node, contextFlags) {
@@ -63748,7 +65458,7 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var realChildren = getSemanticJsxChildren(node.children);
+            var realChildren = ts.getSemanticJsxChildren(node.children);
             var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
             return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
@@ -63796,21 +65506,21 @@ var ts;
                 case 94 /* FalseKeyword */:
                 case 103 /* NullKeyword */:
                 case 78 /* Identifier */:
-                case 149 /* UndefinedKeyword */:
+                case 150 /* UndefinedKeyword */:
                     return true;
-                case 198 /* PropertyAccessExpression */:
-                case 204 /* ParenthesizedExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 280 /* JsxExpression */:
+                case 283 /* 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 === 285 /* 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 === 288 /* 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 === 277 /* 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 === 280 /* 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.
@@ -63835,7 +65545,7 @@ 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, contextFlags) {
-            if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
+            if (contextualType && maybeTypeOfKind(contextualType, 465829888 /* Instantiable */)) {
                 var inferenceContext = getInferenceContext(node);
                 // 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.
@@ -63858,7 +65568,7 @@ var ts;
         // 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 */) {
+            if (type.flags & 465829888 /* Instantiable */) {
                 return instantiateType(type, mapper);
             }
             if (type.flags & 1048576 /* Union */) {
@@ -63896,58 +65606,58 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 246 /* VariableDeclaration */:
-                case 159 /* Parameter */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 195 /* BindingElement */:
+                case 249 /* VariableDeclaration */:
+                case 160 /* Parameter */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 198 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node, contextFlags);
-                case 206 /* ArrowFunction */:
-                case 239 /* ReturnStatement */:
+                case 209 /* ArrowFunction */:
+                case 242 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 210 /* AwaitExpression */:
+                case 213 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent, contextFlags);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     if (parent.expression.kind === 99 /* ImportKeyword */) {
                         return stringType;
                     }
                 /* falls through */
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 203 /* TypeAssertionExpression */:
-                case 221 /* AsExpression */:
+                case 206 /* TypeAssertionExpression */:
+                case 224 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? tryFindWhenConstTypeReference(parent) : getTypeFromTypeNode(parent.type);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node, contextFlags);
-                case 285 /* PropertyAssignment */:
-                case 286 /* ShorthandPropertyAssignment */:
+                case 288 /* PropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent, contextFlags);
-                case 287 /* SpreadAssignment */:
+                case 290 /* SpreadAssignment */:
                     return getApparentTypeOfContextualType(parent.parent, contextFlags);
-                case 196 /* ArrayLiteralExpression */: {
+                case 199 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
                     var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node, contextFlags);
-                case 225 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 215 /* TemplateExpression */);
+                case 228 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 218 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 204 /* ParenthesizedExpression */: {
+                case 207 /* 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, contextFlags);
                 }
-                case 280 /* JsxExpression */:
+                case 283 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 277 /* JsxAttribute */:
-                case 279 /* JsxSpreadAttribute */:
+                case 280 /* JsxAttribute */:
+                case 282 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 272 /* JsxOpeningElement */:
-                case 271 /* JsxSelfClosingElement */:
+                case 275 /* JsxOpeningElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent, contextFlags);
             }
             return undefined;
@@ -64110,7 +65820,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 205 /* FunctionExpression */ || node.kind === 206 /* ArrowFunction */;
+            return node.kind === 208 /* FunctionExpression */ || node.kind === 209 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -64124,7 +65834,7 @@ var ts;
         // 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 !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
@@ -64138,8 +65848,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
-                var current = types_17[_i];
+            for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
+                var current = types_18[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -64172,8 +65882,8 @@ var ts;
             return node.isSpread ? getIndexedAccessType(node.type, numberType) : node.type;
         }
         function hasDefaultValue(node) {
-            return (node.kind === 195 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */);
+            return (node.kind === 198 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -64185,7 +65895,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var i = 0; i < elementCount; i++) {
                 var e = elements[i];
-                if (e.kind === 217 /* SpreadElement */) {
+                if (e.kind === 220 /* SpreadElement */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(e, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
                     }
@@ -64248,7 +65958,7 @@ var ts;
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
                 case 78 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
@@ -64298,7 +66008,7 @@ var ts;
                 // 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 */) &&
+                    !isTypeAssignableToKind(links.resolvedType, 402653316 /* 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);
                 }
@@ -64344,7 +66054,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 193 /* ObjectBindingPattern */ || contextualType.pattern.kind === 197 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 196 /* ObjectBindingPattern */ || contextualType.pattern.kind === 200 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -64367,16 +66077,16 @@ var ts;
             for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                 var memberDecl = _c[_b];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 157 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 158 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 285 /* PropertyAssignment */ ||
-                    memberDecl.kind === 286 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 288 /* PropertyAssignment */ ||
+                    memberDecl.kind === 289 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 285 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                    var type = memberDecl.kind === 288 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
                         // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
                         // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
                         // we don't want to say "could not find 'a'".
-                        memberDecl.kind === 286 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) :
+                        memberDecl.kind === 289 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -64399,8 +66109,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 === 285 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 286 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 288 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 289 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -64426,7 +66136,7 @@ var ts;
                     member = prop;
                     allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
-                else if (memberDecl.kind === 287 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 290 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -64455,7 +66165,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 === 166 /* GetAccessor */ || memberDecl.kind === 167 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 167 /* GetAccessor */ || memberDecl.kind === 168 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -64480,7 +66190,7 @@ var ts;
             // type with those properties for which the binding pattern specifies a default value.
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
-            if (contextualTypeHasPattern && node.parent.kind !== 287 /* SpreadAssignment */) {
+            if (contextualTypeHasPattern && node.parent.kind !== 290 /* SpreadAssignment */) {
                 for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) {
                     var prop = _e[_d];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
@@ -64522,7 +66232,7 @@ var ts;
             }
         }
         function isValidSpreadType(type) {
-            if (type.flags & 63176704 /* Instantiable */) {
+            if (type.flags & 465829888 /* Instantiable */) {
                 var constraint = getBaseConstraintOfType(type);
                 if (constraint !== undefined) {
                     return isValidSpreadType(constraint);
@@ -64534,7 +66244,6 @@ var ts;
         }
         function checkJsxSelfClosingElementDeferred(node) {
             checkJsxOpeningLikeElementOrOpeningFragment(node);
-            resolveUntypedCall(node); // ensure type arguments and parameters are typechecked, even if there is an arity error
         }
         function checkJsxSelfClosingElement(node, _checkMode) {
             checkNodeDeferred(node);
@@ -64561,7 +66270,7 @@ var ts;
             // by default, jsx:'react' will use jsxFactory = React.createElement and jsxFragmentFactory = React.Fragment
             // if jsxFactory compiler option is provided, ensure jsxFragmentFactory compiler option or @jsxFrag pragma is provided too
             var nodeSourceFile = ts.getSourceFileOfNode(node);
-            if (compilerOptions.jsx === 2 /* React */ && (compilerOptions.jsxFactory || nodeSourceFile.pragmas.has("jsx"))
+            if (ts.getJSXTransformEnabled(compilerOptions) && (compilerOptions.jsxFactory || nodeSourceFile.pragmas.has("jsx"))
                 && !compilerOptions.jsxFragmentFactory && !nodeSourceFile.pragmas.has("jsxfrag")) {
                 error(node, compilerOptions.jsxFactory
                     ? ts.Diagnostics.The_jsxFragmentFactory_compiler_option_must_be_provided_to_use_JSX_fragments_with_the_jsxFactory_compiler_option
@@ -64613,7 +66322,7 @@ var ts;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
                     objectFlags |= ts.getObjectFlags(exprType) & 3670016 /* PropagatingFlags */;
-                    var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
+                    var attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
                     if (member.valueDeclaration) {
@@ -64628,7 +66337,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 279 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 282 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -64654,7 +66363,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 270 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 273 /* 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);
@@ -64668,7 +66377,7 @@ var ts;
                     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);
+                    var childrenPropSymbol = createSymbol(4 /* Property */, jsxChildrenPropertyName);
                     childrenPropSymbol.type = childrenTypes.length === 1 ? childrenTypes[0] :
                         childrenContextualType && forEachType(childrenContextualType, isTupleLikeType) ? createTupleType(childrenTypes) :
                             createArrayType(getUnionType(childrenTypes));
@@ -64711,6 +66420,9 @@ var ts;
                         childrenTypes.push(stringType);
                     }
                 }
+                else if (child.kind === 283 /* JsxExpression */ && !child.expression) {
+                    continue; // empty jsx expressions don't *really* count as present children
+                }
                 else {
                     childrenTypes.push(checkExpressionForMutableLocation(child, checkMode));
                 }
@@ -64780,29 +66492,60 @@ var ts;
             }
             return links.resolvedSymbol;
         }
+        function getJsxNamespaceContainerForImplicitImport(location) {
+            var file = location && ts.getSourceFileOfNode(location);
+            var links = file && getNodeLinks(file);
+            if (links && links.jsxImplicitImportContainer === false) {
+                return undefined;
+            }
+            if (links && links.jsxImplicitImportContainer) {
+                return links.jsxImplicitImportContainer;
+            }
+            var runtimeImportSpecifier = ts.getJSXRuntimeImport(ts.getJSXImplicitImportBase(compilerOptions, file), compilerOptions);
+            if (!runtimeImportSpecifier) {
+                return undefined;
+            }
+            var isClassic = ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Classic;
+            var errorMessage = isClassic
+                ? ts.Diagnostics.Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option
+                : ts.Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations;
+            var mod = resolveExternalModule(location, runtimeImportSpecifier, errorMessage, location);
+            var result = mod && mod !== unknownSymbol ? getMergedSymbol(resolveSymbol(mod)) : undefined;
+            if (links) {
+                links.jsxImplicitImportContainer = result || false;
+            }
+            return result;
+        }
         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);
+                var resolvedNamespace = getJsxNamespaceContainerForImplicitImport(location);
+                if (!resolvedNamespace || resolvedNamespace === unknownSymbol) {
+                    var namespaceName = getJsxNamespace(location);
+                    resolvedNamespace = resolveName(location, namespaceName, 1920 /* Namespace */, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
+                }
                 if (resolvedNamespace) {
                     var candidate = resolveSymbol(getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920 /* Namespace */));
-                    if (candidate) {
+                    if (candidate && candidate !== unknownSymbol) {
                         if (links) {
                             links.jsxNamespace = candidate;
                         }
                         return candidate;
                     }
-                    if (links) {
-                        links.jsxNamespace = false;
-                    }
+                }
+                if (links) {
+                    links.jsxNamespace = false;
                 }
             }
             // JSX global fallback
-            return getGlobalSymbol(JsxNames.JSX, 1920 /* Namespace */, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+            var s = resolveSymbol(getGlobalSymbol(JsxNames.JSX, 1920 /* Namespace */, /*diagnosticMessage*/ undefined));
+            if (s === unknownSymbol) {
+                return undefined; // TODO: GH#18217
+            }
+            return s; // TODO: GH#18217
         }
         /**
          * Look into JSX namespace and then look for container with matching name as nameOfAttribPropContainer.
@@ -64989,23 +66732,25 @@ var ts;
                 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 jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var jsxFactoryNamespace = getJsxNamespace(node);
-            var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
-            // allow null as jsxFragmentFactory
-            var jsxFactorySym;
-            if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
-                jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551 /* Value */, jsxFactoryRefErr, jsxFactoryNamespace, /*isUse*/ true);
-            }
-            if (jsxFactorySym) {
-                // Mark local symbol as referenced here because it might not have been marked
-                // if jsx emit was not jsxFactory as there wont be error being emitted
-                jsxFactorySym.isReferenced = 67108863 /* All */;
-                // If react/jsxFactory symbol is alias, mark it as refereced
-                if (jsxFactorySym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
-                    markAliasSymbolAsReferenced(jsxFactorySym);
+            if (!getJsxNamespaceContainerForImplicitImport(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 jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
+                var jsxFactoryNamespace = getJsxNamespace(node);
+                var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
+                // allow null as jsxFragmentFactory
+                var jsxFactorySym = void 0;
+                if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
+                    jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551 /* Value */, jsxFactoryRefErr, jsxFactoryNamespace, /*isUse*/ true);
+                }
+                if (jsxFactorySym) {
+                    // Mark local symbol as referenced here because it might not have been marked
+                    // if jsx emit was not jsxFactory as there wont be error being emitted
+                    jsxFactorySym.isReferenced = 67108863 /* All */;
+                    // If react/jsxFactory symbol is alias, mark it as refereced
+                    if (jsxFactorySym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
+                        markAliasSymbolAsReferenced(jsxFactorySym);
+                    }
                 }
             }
             if (isNodeOpeningLikeElement) {
@@ -65095,7 +66840,7 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 156 /* QualifiedName */ ? node.right : node.kind === 192 /* ImportType */ ? node : node.name;
+            var errorNode = node.kind === 157 /* QualifiedName */ ? node.right : node.kind === 195 /* ImportType */ ? node : node.name;
             if (isSuper) {
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
@@ -65249,7 +66994,7 @@ var ts;
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, checkNonNullExpression(node.left), node.right);
         }
         function isMethodAccessForCall(node) {
-            while (node.parent.kind === 204 /* ParenthesizedExpression */) {
+            while (node.parent.kind === 207 /* ParenthesizedExpression */) {
                 node = node.parent;
             }
             return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
@@ -65307,10 +67052,10 @@ var ts;
             return false;
         }
         function isThisPropertyAccessInConstructor(node, prop) {
-            return ts.isThisProperty(node) && (isAutoTypedProperty(prop) || isConstructorDeclaredProperty(prop)) && ts.getThisContainer(node, /*includeArrowFunctions*/ true) === getDeclaringConstructor(prop);
+            return (isConstructorDeclaredProperty(prop) || ts.isThisProperty(node) && isAutoTypedProperty(prop))
+                && ts.getThisContainer(node, /*includeArrowFunctions*/ true) === getDeclaringConstructor(prop);
         }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, leftType, right) {
-            var _a;
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
             var assignmentKind = ts.getAssignmentTargetKind(node);
             var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
@@ -65372,10 +67117,10 @@ var ts;
                 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;
+                propType = (compilerOptions.noUncheckedIndexedAccess && !ts.isAssignmentTarget(node)) ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
             }
             else {
-                if (((_a = prop.valueDeclaration) === null || _a === void 0 ? void 0 : _a.flags) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
+                if (getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
                     errorOrSuggestion(/* isError */ false, right, ts.Diagnostics._0_is_deprecated, right.escapedText);
                 }
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
@@ -65412,7 +67157,7 @@ var ts;
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 165 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) {
+                    if (flowContainer.kind === 166 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) {
                         assumeUninitialized = true;
                     }
                 }
@@ -65444,8 +67189,8 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 249 /* ClassDeclaration */ &&
-                node.parent.kind !== 172 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 252 /* ClassDeclaration */ &&
+                node.parent.kind !== 173 /* TypeReference */ &&
                 !(valueDeclaration.flags & 8388608 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
@@ -65457,22 +67202,22 @@ var ts;
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         return true;
-                    case 285 /* PropertyAssignment */:
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 287 /* SpreadAssignment */:
-                    case 157 /* ComputedPropertyName */:
-                    case 225 /* TemplateSpan */:
-                    case 280 /* JsxExpression */:
-                    case 277 /* JsxAttribute */:
-                    case 278 /* JsxAttributes */:
-                    case 279 /* JsxSpreadAttribute */:
-                    case 272 /* JsxOpeningElement */:
-                    case 220 /* ExpressionWithTypeArguments */:
-                    case 283 /* HeritageClause */:
+                    case 288 /* PropertyAssignment */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 290 /* SpreadAssignment */:
+                    case 158 /* ComputedPropertyName */:
+                    case 228 /* TemplateSpan */:
+                    case 283 /* JsxExpression */:
+                    case 280 /* JsxAttribute */:
+                    case 281 /* JsxAttributes */:
+                    case 282 /* JsxSpreadAttribute */:
+                    case 275 /* JsxOpeningElement */:
+                    case 223 /* ExpressionWithTypeArguments */:
+                    case 286 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -65528,14 +67273,22 @@ var ts;
                     relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 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);
+                    var missingProperty = ts.declarationNameToString(propNode);
+                    var container = typeToString(containingType);
+                    var libSuggestion = getSuggestedLibForNonExistentProperty(missingProperty, containingType);
+                    if (libSuggestion !== undefined) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2_or_later, missingProperty, container, libSuggestion);
                     }
                     else {
-                        errorInfo = ts.chainDiagnosticMessages(elaborateNeverIntersection(errorInfo, containingType), ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                        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, missingProperty, container, suggestedName);
+                            relatedInfo = suggestion.valueDeclaration && ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestedName);
+                        }
+                        else {
+                            errorInfo = ts.chainDiagnosticMessages(elaborateNeverIntersection(errorInfo, containingType), ts.Diagnostics.Property_0_does_not_exist_on_type_1, missingProperty, container);
+                        }
                     }
                 }
             }
@@ -65549,6 +67302,34 @@ var ts;
             var prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName);
             return prop !== undefined && prop.valueDeclaration && ts.hasSyntacticModifier(prop.valueDeclaration, 32 /* Static */);
         }
+        function getSuggestedLibForNonExistentName(name) {
+            var missingName = diagnosticName(name);
+            var allFeatures = ts.getScriptTargetFeatures();
+            var libTargets = ts.getOwnKeys(allFeatures);
+            for (var _i = 0, libTargets_1 = libTargets; _i < libTargets_1.length; _i++) {
+                var libTarget = libTargets_1[_i];
+                var containingTypes = ts.getOwnKeys(allFeatures[libTarget]);
+                if (containingTypes !== undefined && ts.contains(containingTypes, missingName)) {
+                    return libTarget;
+                }
+            }
+        }
+        function getSuggestedLibForNonExistentProperty(missingProperty, containingType) {
+            var container = getApparentType(containingType).symbol;
+            if (!container) {
+                return undefined;
+            }
+            var allFeatures = ts.getScriptTargetFeatures();
+            var libTargets = ts.getOwnKeys(allFeatures);
+            for (var _i = 0, libTargets_2 = libTargets; _i < libTargets_2.length; _i++) {
+                var libTarget = libTargets_2[_i];
+                var featuresOfLib = allFeatures[libTarget];
+                var featuresOfContainingType = featuresOfLib[ts.symbolName(container)];
+                if (featuresOfContainingType !== undefined && ts.contains(featuresOfContainingType, missingProperty)) {
+                    return libTarget;
+                }
+            }
+        }
         function getSuggestedSymbolForNonexistentProperty(name, containingType) {
             return getSpellingSuggestionForName(ts.isString(name) ? name : ts.idText(name), getPropertiesOfType(containingType), 111551 /* Value */);
         }
@@ -65669,16 +67450,16 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return isValidPropertyAccessWithType(node, node.expression.kind === 105 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 156 /* QualifiedName */:
+                case 157 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 192 /* ImportType */:
+                case 195 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 198 /* PropertyAccessExpression */ && node.expression.kind === 105 /* SuperKeyword */, property.escapedName, type);
+            return isValidPropertyAccessWithType(node, node.kind === 201 /* PropertyAccessExpression */ && node.expression.kind === 105 /* 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) {
@@ -65701,7 +67482,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 247 /* VariableDeclarationList */) {
+            if (initializer.kind === 250 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -65730,7 +67511,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 235 /* ForInStatement */ &&
+                        if (node.kind === 238 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -65767,7 +67548,7 @@ var ts;
             var accessFlags = ts.isAssignmentTarget(node) ?
                 2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
                 0 /* None */;
-            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, /*noUncheckedIndexedAccessCandidate*/ undefined, node, accessFlags | 16 /* ExpressionPosition */) || errorType;
             return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
@@ -65814,13 +67595,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 202 /* TaggedTemplateExpression */) {
+            if (node.kind === 205 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 160 /* Decorator */) {
+            else if (node.kind !== 161 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -65884,7 +67665,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 217 /* SpreadElement */ || arg.kind === 224 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 220 /* SpreadElement */ || arg.kind === 227 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -65892,15 +67673,18 @@ var ts;
         function acceptsVoid(t) {
             return !!(t.flags & 16384 /* Void */);
         }
+        function acceptsVoidUndefinedUnknownOrAny(t) {
+            return !!(t.flags & (16384 /* Void */ | 32768 /* Undefined */ | 2 /* Unknown */ | 1 /* Any */));
+        }
         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 === 202 /* TaggedTemplateExpression */) {
+            if (node.kind === 205 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 215 /* TemplateExpression */) {
+                if (node.template.kind === 218 /* 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.
@@ -65915,7 +67699,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 160 /* Decorator */) {
+            else if (node.kind === 161 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -65929,7 +67713,7 @@ var ts;
             }
             else if (!node.arguments) {
                 // This only happens when we have something of the form: 'new C'
-                ts.Debug.assert(node.kind === 201 /* NewExpression */);
+                ts.Debug.assert(node.kind === 204 /* NewExpression */);
                 return getMinArgumentCount(signature) === 0;
             }
             else {
@@ -65953,7 +67737,7 @@ var ts;
             }
             for (var i = argCount; i < effectiveMinimumArguments; i++) {
                 var type = getTypeAtPosition(signature, i);
-                if (filterType(type, acceptsVoid).flags & 131072 /* Never */) {
+                if (filterType(type, ts.isInJSFile(node) && !strictNullChecks ? acceptsVoidUndefinedUnknownOrAny : acceptsVoid).flags & 131072 /* Never */) {
                     return false;
                 }
             }
@@ -66023,7 +67807,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 !== 160 /* Decorator */) {
+            if (node.kind !== 161 /* Decorator */) {
                 var contextualType = getContextualType(node, ts.every(signature.typeParameters, function (p) { return !!getDefaultFromTypeParameter(p); }) ? 8 /* SkipBindingPatterns */ : 0 /* None */);
                 if (contextualType) {
                     // We clone the inference context to avoid disturbing a resolution in progress for an
@@ -66072,7 +67856,7 @@ var ts;
             }
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 219 /* OmittedExpression */) {
+                if (arg.kind !== 222 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -66096,7 +67880,7 @@ 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 getMutableArrayOrTupleType(arg.kind === 224 /* SyntheticExpression */ ? arg.type :
+                    return getMutableArrayOrTupleType(arg.kind === 227 /* SyntheticExpression */ ? arg.type :
                         checkExpressionWithContextualType(arg.expression, restType, context, checkMode));
                 }
             }
@@ -66106,24 +67890,24 @@ var ts;
             for (var i = index; i < argCount; i++) {
                 var arg = args[i];
                 if (isSpreadArgument(arg)) {
-                    var spreadType = arg.kind === 224 /* SyntheticExpression */ ? arg.type : checkExpression(arg.expression);
+                    var spreadType = arg.kind === 227 /* SyntheticExpression */ ? arg.type : checkExpression(arg.expression);
                     if (isArrayLikeType(spreadType)) {
                         types.push(spreadType);
                         flags.push(8 /* Variadic */);
                     }
                     else {
-                        types.push(checkIteratedTypeOrElementType(33 /* Spread */, spreadType, undefinedType, arg.kind === 217 /* SpreadElement */ ? arg.expression : arg));
+                        types.push(checkIteratedTypeOrElementType(33 /* Spread */, spreadType, undefinedType, arg.kind === 220 /* SpreadElement */ ? arg.expression : arg));
                         flags.push(4 /* Rest */);
                     }
                 }
                 else {
                     var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                     var argType = checkExpressionWithContextualType(arg, contextualType, context, checkMode);
-                    var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
+                    var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */);
                     types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
                     flags.push(1 /* Required */);
                 }
-                if (arg.kind === 224 /* SyntheticExpression */ && arg.tupleNameSource) {
+                if (arg.kind === 227 /* SyntheticExpression */ && arg.tupleNameSource) {
                     names.push(arg.tupleNameSource);
                 }
             }
@@ -66264,7 +68048,7 @@ var ts;
                 return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 201 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 204 /* 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.
@@ -66294,7 +68078,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 !== 219 /* OmittedExpression */) {
+                if (arg.kind !== 222 /* 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),
@@ -66335,7 +68119,7 @@ var ts;
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 200 /* CallExpression */) {
+            if (node.kind === 203 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
                 if (ts.isAccessExpression(callee)) {
                     return callee.expression;
@@ -66352,17 +68136,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 202 /* TaggedTemplateExpression */) {
+            if (node.kind === 205 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 215 /* TemplateExpression */) {
+                if (template.kind === 218 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args_3.push(span.expression);
                     });
                 }
                 return args_3;
             }
-            if (node.kind === 160 /* Decorator */) {
+            if (node.kind === 161 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -66373,10 +68157,10 @@ var ts;
             if (spreadIndex >= 0) {
                 // Create synthetic arguments from spreads of tuple types.
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_19 = function (i) {
+                var _loop_20 = function (i) {
                     var arg = args[i];
                     // We can call checkExpressionCached because spread expressions never have a contextual type.
-                    var spreadType = arg.kind === 217 /* SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
+                    var spreadType = arg.kind === 220 /* SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
                     if (spreadType && isTupleType(spreadType)) {
                         ts.forEach(getTypeArguments(spreadType), function (t, i) {
                             var _a;
@@ -66390,7 +68174,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_19(i);
+                    _loop_20(i);
                 }
                 return effectiveArgs_1;
             }
@@ -66403,30 +68187,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* 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 159 /* Parameter */:
+                case 160 /* 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 === 165 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 166 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 162 /* PropertyDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 163 /* PropertyDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* 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 !== 162 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 163 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -66440,17 +68224,17 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return 1;
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return 2;
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* 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 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
@@ -66481,6 +68265,20 @@ var ts;
                 return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
             }
         }
+        function isPromiseResolveArityError(node) {
+            if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression))
+                return false;
+            var symbol = resolveName(node.expression, node.expression.escapedText, 111551 /* Value */, undefined, undefined, false);
+            var decl = symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration;
+            if (!decl || !ts.isParameter(decl) || !isFunctionExpressionOrArrowFunction(decl.parent) || !ts.isNewExpression(decl.parent.parent) || !ts.isIdentifier(decl.parent.parent.expression)) {
+                return false;
+            }
+            var globalPromiseSymbol = getGlobalPromiseConstructorSymbol(/*reportErrors*/ false);
+            if (!globalPromiseSymbol)
+                return false;
+            var constructorSymbol = getSymbolAtLocation(decl.parent.parent.expression, /*ignoreErrors*/ true);
+            return constructorSymbol === globalPromiseSymbol;
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -66512,9 +68310,15 @@ var ts;
             }
             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;
+            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 :
+                paramRange === 1 && argCount === 0 && isPromiseResolveArityError(node) ?
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_Did_you_forget_to_include_void_in_your_type_argument_to_Promise :
+                    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) {
@@ -66577,8 +68381,8 @@ 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, callChainFlags, fallbackError) {
-            var isTaggedTemplate = node.kind === 202 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 160 /* Decorator */;
+            var isTaggedTemplate = node.kind === 205 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 161 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray && produceDiagnostics;
             var typeArguments;
@@ -66640,7 +68444,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 === 200 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 203 /* 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
@@ -66652,10 +68456,10 @@ var ts;
             // 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);
+                result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
             }
             if (!result) {
-                result = chooseOverload(candidates, assignableRelation, signatureHelpTrailingComma);
+                result = chooseOverload(candidates, assignableRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
             }
             if (result) {
                 return result;
@@ -66680,6 +68484,7 @@ var ts;
                                 if (last_2.declaration && candidatesForArgumentError.length > 3) {
                                     ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
                                 }
+                                addImplementationSuccessElaboration(last_2, d);
                                 diagnostics.add(d);
                             }
                         }
@@ -66693,7 +68498,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_20 = function (c) {
+                        var _loop_21 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -66711,19 +68516,24 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_20(c);
+                            _loop_21(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
                         var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
-                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        // The below is a spread to guarantee we get a new (mutable) array - our `flatMap` helper tries to do "smart" optimizations where it reuses input
+                        // arrays and the emptyArray singleton where possible, which is decidedly not what we want while we're still constructing this diagnostic
+                        var related = __spreadArrays(ts.flatMap(diags_3, function (d) { return d.relatedInformation; }));
+                        var diag = void 0;
                         if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
                             var _b = diags_3[0], file = _b.file, start = _b.start, length_6 = _b.length;
-                            diagnostics.add({ file: file, start: start, length: length_6, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                            diag = { file: file, start: start, length: length_6, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related };
                         }
                         else {
-                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                            diag = ts.createDiagnosticForNodeFromMessageChain(node, chain, related);
                         }
+                        addImplementationSuccessElaboration(candidatesForArgumentError[0], diag);
+                        diagnostics.add(diag);
                     }
                 }
                 else if (candidateForArgumentArityError) {
@@ -66746,7 +68556,26 @@ var ts;
                 }
             }
             return getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
-            function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
+            function addImplementationSuccessElaboration(failed, diagnostic) {
+                var _a, _b;
+                var oldCandidatesForArgumentError = candidatesForArgumentError;
+                var oldCandidateForArgumentArityError = candidateForArgumentArityError;
+                var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
+                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
+                var isOverload = declCount > 1;
+                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                if (implDecl) {
+                    var candidate = getSignatureFromDeclaration(implDecl);
+                    var isSingleNonGenericCandidate_1 = !candidate.typeParameters;
+                    if (chooseOverload([candidate], assignableRelation, isSingleNonGenericCandidate_1)) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(implDecl, ts.Diagnostics.The_call_would_have_succeeded_against_this_implementation_but_implementation_signatures_of_overloads_are_not_externally_visible));
+                    }
+                }
+                candidatesForArgumentError = oldCandidatesForArgumentError;
+                candidateForArgumentArityError = oldCandidateForArgumentArityError;
+                candidateForTypeArgumentError = oldCandidateForTypeArgumentError;
+            }
+            function chooseOverload(candidates, relation, isSingleNonGenericCandidate, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
                 candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
@@ -66845,7 +68674,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_21 = function (i) {
+            var _loop_22 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -66853,7 +68682,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_21(i);
+                _loop_22(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -67156,7 +68985,7 @@ var ts;
             var declaration = signature.declaration;
             var modifiers = ts.getSelectedEffectiveModifierFlags(declaration, 24 /* NonPublicAccessibilityModifier */);
             // (1) Public constructors and (2) constructor functions are always accessible.
-            if (!modifiers || declaration.kind !== 165 /* Constructor */) {
+            if (!modifiers || declaration.kind !== 166 /* Constructor */) {
                 return true;
             }
             var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
@@ -67188,8 +69017,8 @@ var ts;
             if (apparentType.flags & 1048576 /* Union */) {
                 var types = apparentType.types;
                 var hasSignatures = false;
-                for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
-                    var constituent = types_18[_i];
+                for (var _i = 0, types_19 = types; _i < types_19.length; _i++) {
+                    var constituent = types_19[_i];
                     var signatures = getSignaturesOfType(constituent, kind);
                     if (signatures.length !== 0) {
                         hasSignatures = true;
@@ -67285,6 +69114,11 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
+                if (ts.isArrayLiteralExpression(node.parent)) {
+                    var diagnostic = ts.createDiagnosticForNode(node.tag, ts.Diagnostics.It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tagged_template_expression_which_cannot_be_invoked);
+                    diagnostics.add(diagnostic);
+                    return resolveErrorCall(node);
+                }
                 invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
@@ -67295,16 +69129,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -67363,6 +69197,10 @@ var ts;
                 var result = getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
                 var fakeSignature = createSignatureForJSXIntrinsic(node, result);
                 checkTypeAssignableToAndOptionallyElaborate(checkExpressionWithContextualType(node.attributes, getEffectiveFirstArgumentForJsxSignature(fakeSignature, node), /*mapper*/ undefined, 0 /* Normal */), result, node.tagName, node.attributes);
+                if (ts.length(node.typeArguments)) {
+                    ts.forEach(node.typeArguments, checkSourceElement);
+                    diagnostics.add(ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), node.typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, 0, ts.length(node.typeArguments)));
+                }
                 return fakeSignature;
             }
             var exprTypes = checkExpression(node.tagName);
@@ -67395,16 +69233,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 160 /* Decorator */:
+                case 161 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 272 /* JsxOpeningElement */:
-                case 271 /* JsxSelfClosingElement */:
+                case 275 /* JsxOpeningElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -67482,20 +69320,61 @@ var ts;
             }
         }
         function getAssignedClassSymbol(decl) {
-            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);
+            var _a;
+            var assignmentSymbol = decl && getSymbolOfExpando(decl, /*allowDeclaration*/ true);
+            var prototype = (_a = assignmentSymbol === null || assignmentSymbol === void 0 ? void 0 : assignmentSymbol.exports) === null || _a === void 0 ? void 0 : _a.get("prototype");
+            var init = (prototype === null || prototype === void 0 ? void 0 : prototype.valueDeclaration) && getAssignedJSPrototype(prototype.valueDeclaration);
             return init ? getSymbolOfNode(init) : undefined;
         }
+        function getSymbolOfExpando(node, allowDeclaration) {
+            if (!node.parent) {
+                return undefined;
+            }
+            var name;
+            var decl;
+            if (ts.isVariableDeclaration(node.parent) && node.parent.initializer === node) {
+                if (!ts.isInJSFile(node) && !(ts.isVarConst(node.parent) && ts.isFunctionLikeDeclaration(node))) {
+                    return undefined;
+                }
+                name = node.parent.name;
+                decl = node.parent;
+            }
+            else if (ts.isBinaryExpression(node.parent)) {
+                var parentNode = node.parent;
+                var parentNodeOperator = node.parent.operatorToken.kind;
+                if (parentNodeOperator === 62 /* EqualsToken */ && (allowDeclaration || parentNode.right === node)) {
+                    name = parentNode.left;
+                    decl = name;
+                }
+                else if (parentNodeOperator === 56 /* BarBarToken */ || parentNodeOperator === 60 /* QuestionQuestionToken */) {
+                    if (ts.isVariableDeclaration(parentNode.parent) && parentNode.parent.initializer === parentNode) {
+                        name = parentNode.parent.name;
+                        decl = parentNode.parent;
+                    }
+                    else if (ts.isBinaryExpression(parentNode.parent) && parentNode.parent.operatorToken.kind === 62 /* EqualsToken */ && (allowDeclaration || parentNode.parent.right === parentNode)) {
+                        name = parentNode.parent.left;
+                        decl = name;
+                    }
+                    if (!name || !ts.isBindableStaticNameExpression(name) || !ts.isSameEntityName(name, parentNode.left)) {
+                        return undefined;
+                    }
+                }
+            }
+            else if (allowDeclaration && ts.isFunctionDeclaration(node)) {
+                name = node.name;
+                decl = node;
+            }
+            if (!decl || !name || (!allowDeclaration && !ts.getExpandoInitializer(node, ts.isPrototypeAccess(name)))) {
+                return undefined;
+            }
+            return getSymbolOfNode(decl);
+        }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 198 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 201 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
             if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 62 /* EqualsToken */) {
@@ -67522,12 +69401,12 @@ var ts;
             if (node.expression.kind === 105 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 201 /* NewExpression */) {
+            if (node.kind === 204 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 165 /* Constructor */ &&
-                    declaration.kind !== 169 /* ConstructSignature */ &&
-                    declaration.kind !== 174 /* ConstructorType */ &&
+                    declaration.kind !== 166 /* Constructor */ &&
+                    declaration.kind !== 170 /* ConstructSignature */ &&
+                    declaration.kind !== 175 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -67547,7 +69426,7 @@ var ts;
             if (returnType.flags & 12288 /* ESSymbolLike */ && isSymbolOrSymbolForCall(node)) {
                 return getESSymbolLikeTypeForNode(ts.walkUpParenthesizedExpressions(node.parent));
             }
-            if (node.kind === 200 /* CallExpression */ && node.parent.kind === 230 /* ExpressionStatement */ &&
+            if (node.kind === 203 /* CallExpression */ && node.parent.kind === 233 /* ExpressionStatement */ &&
                 returnType.flags & 16384 /* Void */ && getTypePredicateOfSignature(signature)) {
                 if (!ts.isDottedName(node.expression)) {
                     error(node.expression, ts.Diagnostics.Assertions_require_the_call_target_to_be_an_identifier_or_qualified_name);
@@ -67558,14 +69437,11 @@ var ts;
                 }
             }
             if (ts.isInJSFile(node)) {
-                var decl = ts.getDeclarationOfExpando(node);
-                if (decl) {
-                    var jsSymbol = getSymbolOfNode(decl);
-                    if ((_a = jsSymbol === null || jsSymbol === void 0 ? void 0 : jsSymbol.exports) === null || _a === void 0 ? void 0 : _a.size) {
-                        var jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, ts.emptyArray, ts.emptyArray, undefined, undefined);
-                        jsAssignmentType.objectFlags |= 16384 /* JSLiteral */;
-                        return getIntersectionType([returnType, jsAssignmentType]);
-                    }
+                var jsSymbol = getSymbolOfExpando(node, /*allowDeclaration*/ false);
+                if ((_a = jsSymbol === null || jsSymbol === void 0 ? void 0 : jsSymbol.exports) === null || _a === void 0 ? void 0 : _a.size) {
+                    var jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, ts.emptyArray, ts.emptyArray, undefined, undefined);
+                    jsAssignmentType.objectFlags |= 16384 /* JSLiteral */;
+                    return getIntersectionType([returnType, jsAssignmentType]);
                 }
             }
             return returnType;
@@ -67579,20 +69455,20 @@ var ts;
         function getDeprecatedSuggestionNode(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 200 /* CallExpression */:
-                case 160 /* Decorator */:
-                case 201 /* NewExpression */:
+                case 203 /* CallExpression */:
+                case 161 /* Decorator */:
+                case 204 /* NewExpression */:
                     return getDeprecatedSuggestionNode(node.expression);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return getDeprecatedSuggestionNode(node.tag);
-                case 272 /* JsxOpeningElement */:
-                case 271 /* JsxSelfClosingElement */:
+                case 275 /* JsxOpeningElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return getDeprecatedSuggestionNode(node.tagName);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return node.argumentExpression;
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return node.name;
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     var typeReference = node;
                     return ts.isQualifiedName(typeReference.typeName) ? typeReference.typeName.right : typeReference;
                 default:
@@ -67651,6 +69527,7 @@ var ts;
                     if (hasSyntheticDefault) {
                         var memberTable = ts.createSymbolTable();
                         var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
+                        newSymbol.parent = originalSymbol;
                         newSymbol.nameType = getLiteralType("default");
                         newSymbol.target = resolveSymbol(symbol);
                         memberTable.set("default" /* Default */, newSymbol);
@@ -67683,9 +69560,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 248 /* FunctionDeclaration */
+                ? 251 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 246 /* VariableDeclaration */
+                    ? 249 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -67715,18 +69592,19 @@ var ts;
                 case 9 /* BigIntLiteral */:
                 case 109 /* TrueKeyword */:
                 case 94 /* FalseKeyword */:
-                case 196 /* ArrayLiteralExpression */:
-                case 197 /* ObjectLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
+                case 218 /* TemplateExpression */:
                     return true;
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 40 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 39 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     var expr = node.expression;
                     if (ts.isIdentifier(expr)) {
                         var symbol = getSymbolAtLocation(expr);
@@ -67782,7 +69660,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 === 165 /* Constructor */) {
+            else if (container.kind === 166 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -67792,8 +69670,8 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.System) {
-                error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_esnext_or_system);
+            if (moduleKind !== ts.ModuleKind.ES2020 && moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.System) {
+                error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_esnext_or_system);
             }
             var file = ts.getSourceFileOfNode(node);
             ts.Debug.assert(!!(file.flags & 2097152 /* PossiblyContainsImportMeta */), "Containing file is missing import meta node flag.");
@@ -67829,7 +69707,7 @@ var ts;
             return restParameter.escapedName;
         }
         function isValidDeclarationForTupleLabel(d) {
-            return d.kind === 191 /* NamedTupleMember */ || (ts.isParameter(d) && d.name && ts.isIdentifier(d.name));
+            return d.kind === 192 /* NamedTupleMember */ || (ts.isParameter(d) && d.name && ts.isIdentifier(d.name));
         }
         function getNameableDeclarationAtPosition(signature, pos) {
             var paramCount = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0);
@@ -67902,21 +69780,40 @@ var ts;
             }
             return length;
         }
-        function getMinArgumentCount(signature, strongArityForUntypedJS) {
-            if (signatureHasRestParameter(signature)) {
-                var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
-                if (isTupleType(restType)) {
-                    var firstOptionalIndex = ts.findIndex(restType.target.elementFlags, function (f) { return !(f & 1 /* Required */); });
-                    var requiredCount = firstOptionalIndex < 0 ? restType.target.fixedLength : firstOptionalIndex;
-                    if (requiredCount > 0) {
-                        return signature.parameters.length - 1 + requiredCount;
+        function getMinArgumentCount(signature, flags) {
+            var strongArityForUntypedJS = flags & 1 /* StrongArityForUntypedJS */;
+            var voidIsNonOptional = flags & 2 /* VoidIsNonOptional */;
+            if (voidIsNonOptional || signature.resolvedMinArgumentCount === undefined) {
+                var minArgumentCount = void 0;
+                if (signatureHasRestParameter(signature)) {
+                    var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                    if (isTupleType(restType)) {
+                        var firstOptionalIndex = ts.findIndex(restType.target.elementFlags, function (f) { return !(f & 1 /* Required */); });
+                        var requiredCount = firstOptionalIndex < 0 ? restType.target.fixedLength : firstOptionalIndex;
+                        if (requiredCount > 0) {
+                            minArgumentCount = signature.parameters.length - 1 + requiredCount;
+                        }
                     }
                 }
+                if (minArgumentCount === undefined) {
+                    if (!strongArityForUntypedJS && signature.flags & 16 /* IsUntypedSignatureInJSFile */) {
+                        return 0;
+                    }
+                    minArgumentCount = signature.minArgumentCount;
+                }
+                if (voidIsNonOptional) {
+                    return minArgumentCount;
+                }
+                for (var i = minArgumentCount - 1; i >= 0; i--) {
+                    var type = getTypeAtPosition(signature, i);
+                    if (filterType(type, acceptsVoid).flags & 131072 /* Never */) {
+                        break;
+                    }
+                    minArgumentCount = i;
+                }
+                signature.resolvedMinArgumentCount = minArgumentCount;
             }
-            if (!strongArityForUntypedJS && signature.flags & 16 /* IsUntypedSignatureInJSFile */) {
-                return 0;
-            }
-            return signature.minArgumentCount;
+            return signature.resolvedMinArgumentCount;
         }
         function hasEffectiveRestParameter(signature) {
             if (signatureHasRestParameter(signature)) {
@@ -68082,7 +69979,7 @@ var ts;
             var yieldType;
             var nextType;
             var fallbackReturnType = voidType;
-            if (func.body.kind !== 227 /* Block */) { // Async or normal arrow function
+            if (func.body.kind !== 230 /* Block */) { // Async or normal arrow function
                 returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
                 if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -68267,7 +70164,7 @@ var ts;
             return links.isExhaustive !== undefined ? links.isExhaustive : (links.isExhaustive = computeExhaustiveSwitchStatement(node));
         }
         function computeExhaustiveSwitchStatement(node) {
-            if (node.expression.kind === 208 /* TypeOfExpression */) {
+            if (node.expression.kind === 211 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 var witnesses = getSwitchClauseTypeOfWitnesses(node, /*retainDefault*/ false);
                 // notEqualFacts states that the type of the switched value is not equal to every type in the switch.
@@ -68330,11 +70227,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return true;
-                case 164 /* MethodDeclaration */:
-                    return func.parent.kind === 197 /* ObjectLiteralExpression */;
+                case 165 /* MethodDeclaration */:
+                    return func.parent.kind === 200 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -68360,7 +70257,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 === 163 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 227 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 164 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 230 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 512 /* HasExplicitReturn */;
@@ -68393,7 +70290,7 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 165 /* 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)) {
@@ -68417,7 +70314,7 @@ var ts;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 205 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 208 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -68463,7 +70360,7 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
             var returnType = getReturnTypeFromAnnotation(node);
             checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
@@ -68476,7 +70373,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 227 /* Block */) {
+                if (node.body.kind === 230 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -68566,7 +70463,7 @@ var ts;
                     expr.expression.kind === 107 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var ctor = ts.getContainingFunction(expr);
-                    if (!(ctor && (ctor.kind === 165 /* Constructor */ || isJSConstructor(ctor)))) {
+                    if (!(ctor && (ctor.kind === 166 /* Constructor */ || isJSConstructor(ctor)))) {
                         return true;
                     }
                     if (symbol.valueDeclaration) {
@@ -68591,7 +70488,7 @@ var ts;
                     var symbol_2 = getNodeLinks(node).resolvedSymbol;
                     if (symbol_2.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol_2);
-                        return !!declaration && declaration.kind === 260 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 263 /* NamespaceImport */;
                     }
                 }
             }
@@ -68672,7 +70569,7 @@ var ts;
                             var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
                             var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules);
                             var func = ts.getContainingFunction(node);
-                            if (func && func.kind !== 165 /* Constructor */ && (ts.getFunctionFlags(func) & 2 /* Async */) === 0) {
+                            if (func && func.kind !== 166 /* Constructor */ && (ts.getFunctionFlags(func) & 2 /* Async */) === 0) {
                                 var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
                                 ts.addRelatedInfo(diagnostic, relatedInfo);
                             }
@@ -68774,8 +70671,8 @@ var ts;
             }
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0, types_19 = types; _i < types_19.length; _i++) {
-                    var t = types_19[_i];
+                for (var _i = 0, types_20 = types; _i < types_20.length; _i++) {
+                    var t = types_20[_i];
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
@@ -68792,7 +70689,7 @@ var ts;
             }
             return !!(kind & 296 /* NumberLike */) && isTypeAssignableTo(source, numberType) ||
                 !!(kind & 2112 /* BigIntLike */) && isTypeAssignableTo(source, bigintType) ||
-                !!(kind & 132 /* StringLike */) && isTypeAssignableTo(source, stringType) ||
+                !!(kind & 402653316 /* StringLike */) && isTypeAssignableTo(source, stringType) ||
                 !!(kind & 528 /* BooleanLike */) && isTypeAssignableTo(source, booleanType) ||
                 !!(kind & 16384 /* Void */) && isTypeAssignableTo(source, voidType) ||
                 !!(kind & 131072 /* Never */) && isTypeAssignableTo(source, neverType) ||
@@ -68841,8 +70738,8 @@ var ts;
             // 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 (!(allTypesAssignableToKind(leftType, 132 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */) ||
-                isTypeAssignableToKind(leftType, 4194304 /* Index */ | 262144 /* TypeParameter */))) {
+            if (!(allTypesAssignableToKind(leftType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */) ||
+                isTypeAssignableToKind(leftType, 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */ | 262144 /* TypeParameter */))) {
                 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 */)) {
@@ -68865,7 +70762,7 @@ var ts;
             if (rightIsThis === void 0) { rightIsThis = false; }
             var properties = node.properties;
             var property = properties[propertyIndex];
-            if (property.kind === 285 /* PropertyAssignment */ || property.kind === 286 /* ShorthandPropertyAssignment */) {
+            if (property.kind === 288 /* PropertyAssignment */ || property.kind === 289 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -68876,11 +70773,11 @@ var ts;
                         checkPropertyAccessibility(property, /*isSuper*/ false, objectLiteralType, prop);
                     }
                 }
-                var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
+                var elementType = getIndexedAccessType(objectLiteralType, exprType, /*noUncheckedIndexedAccessCandidate*/ undefined, name, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, 16 /* ExpressionPosition */);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 286 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 289 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 287 /* SpreadAssignment */) {
+            else if (property.kind === 290 /* SpreadAssignment */) {
                 if (propertyIndex < properties.length - 1) {
                     error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
@@ -68914,23 +70811,28 @@ var ts;
             // 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(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
+            var possiblyOutOfBoundsType = checkIteratedTypeOrElementType(65 /* Destructuring */ | 128 /* PossiblyOutOfBounds */, sourceType, undefinedType, node) || errorType;
+            var inBoundsType = compilerOptions.noUncheckedIndexedAccess ? undefined : possiblyOutOfBoundsType;
             for (var i = 0; i < elements.length; i++) {
-                checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
+                var type = possiblyOutOfBoundsType;
+                if (node.elements[i].kind === 220 /* SpreadElement */) {
+                    type = inBoundsType = inBoundsType !== null && inBoundsType !== void 0 ? inBoundsType : (checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType);
+                }
+                checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, type, checkMode);
             }
             return sourceType;
         }
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 219 /* OmittedExpression */) {
-                if (element.kind !== 217 /* SpreadElement */) {
+            if (element.kind !== 222 /* OmittedExpression */) {
+                if (element.kind !== 220 /* 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 accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
-                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var accessFlags = 16 /* ExpressionPosition */ | (hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0);
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, createSyntheticExpression(element, indexType), accessFlags) || errorType;
                         var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
                         var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
@@ -68942,7 +70844,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 213 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) {
+                    if (restExpression.kind === 216 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -68958,7 +70860,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 286 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 289 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -68974,24 +70876,24 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 213 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) {
+            if (target.kind === 216 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 197 /* ObjectLiteralExpression */) {
+            if (target.kind === 200 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 196 /* ArrayLiteralExpression */) {
+            if (target.kind === 199 /* 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 === 287 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 290 /* 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;
-            var optionalError = target.parent.kind === 287 /* SpreadAssignment */ ?
+            var optionalError = target.parent.kind === 290 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_may_not_be_an_optional_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_may_not_be_an_optional_property_access;
             if (checkReferenceExpression(target, error, optionalError)) {
@@ -69016,36 +70918,36 @@ var ts;
                 case 78 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 202 /* TaggedTemplateExpression */:
-                case 215 /* TemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
+                case 218 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 109 /* TrueKeyword */:
                 case 94 /* FalseKeyword */:
                 case 103 /* NullKeyword */:
-                case 149 /* UndefinedKeyword */:
-                case 205 /* FunctionExpression */:
-                case 218 /* ClassExpression */:
-                case 206 /* ArrowFunction */:
-                case 196 /* ArrayLiteralExpression */:
-                case 197 /* ObjectLiteralExpression */:
-                case 208 /* TypeOfExpression */:
-                case 222 /* NonNullExpression */:
-                case 271 /* JsxSelfClosingElement */:
-                case 270 /* JsxElement */:
+                case 150 /* UndefinedKeyword */:
+                case 208 /* FunctionExpression */:
+                case 221 /* ClassExpression */:
+                case 209 /* ArrowFunction */:
+                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
+                case 211 /* TypeOfExpression */:
+                case 225 /* NonNullExpression */:
+                case 274 /* JsxSelfClosingElement */:
+                case 273 /* JsxElement */:
                     return true;
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 211 /* PrefixUnaryExpression */:
-                case 212 /* PostfixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -69057,9 +70959,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 209 /* VoidExpression */: // Explicit opt-out
-                case 203 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 221 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 212 /* VoidExpression */: // Explicit opt-out
+                case 206 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 224 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -69091,7 +70993,7 @@ var ts;
                         }
                         checkGrammarNullishCoalesceWithLogicalExpression(node);
                         var operator = node.operatorToken.kind;
-                        if (operator === 62 /* EqualsToken */ && (node.left.kind === 197 /* ObjectLiteralExpression */ || node.left.kind === 196 /* ArrayLiteralExpression */)) {
+                        if (operator === 62 /* EqualsToken */ && (node.left.kind === 200 /* ObjectLiteralExpression */ || node.left.kind === 199 /* ArrayLiteralExpression */)) {
                             finishInvocation(checkDestructuringAssignment(node.left, checkExpression(node.right, checkMode), checkMode, node.right.kind === 107 /* ThisKeyword */));
                             break;
                         }
@@ -69158,7 +71060,7 @@ var ts;
         // expression-wide checks and does not use a work stack to fold nested binary expressions into the same callstack frame
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 62 /* EqualsToken */ && (left.kind === 197 /* ObjectLiteralExpression */ || left.kind === 196 /* ArrayLiteralExpression */)) {
+            if (operator === 62 /* EqualsToken */ && (left.kind === 200 /* ObjectLiteralExpression */ || left.kind === 199 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 107 /* ThisKeyword */);
             }
             var leftType;
@@ -69251,7 +71153,7 @@ var ts;
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
-                    if (!isTypeAssignableToKind(leftType, 132 /* StringLike */) && !isTypeAssignableToKind(rightType, 132 /* StringLike */)) {
+                    if (!isTypeAssignableToKind(leftType, 402653316 /* StringLike */) && !isTypeAssignableToKind(rightType, 402653316 /* StringLike */)) {
                         leftType = checkNonNullType(leftType, left);
                         rightType = checkNonNullType(rightType, right);
                     }
@@ -69265,7 +71167,7 @@ var ts;
                         // 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)) {
+                    else if (isTypeAssignableToKind(leftType, 402653316 /* StringLike */, /*strict*/ true) || isTypeAssignableToKind(rightType, 402653316 /* StringLike */, /*strict*/ true)) {
                         // If one or both operands are of the String primitive type, the result is of the String primitive type.
                         resultType = stringType;
                     }
@@ -69283,7 +71185,7 @@ var ts;
                         // If both types have an awaited type of one of these, we'll assume the user
                         // might be missing an await without doing an exhaustive check that inserting
                         // await(s) will actually be a completely valid binary expression.
-                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 402653316 /* StringLike */ | 3 /* AnyOrUnknown */;
                         reportOperatorError(function (left, right) {
                             return isTypeAssignableToKind(left, closeEnoughKind_1) &&
                                 isTypeAssignableToKind(right, closeEnoughKind_1);
@@ -69584,20 +71486,21 @@ var ts;
             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);
+            var texts = [node.head.text];
+            var types = [];
+            for (var _i = 0, _a = node.templateSpans; _i < _a.length; _i++) {
+                var span = _a[_i];
+                var type = checkExpression(span.expression);
+                if (maybeTypeOfKind(type, 12288 /* ESSymbolLike */)) {
+                    error(span.expression, ts.Diagnostics.Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_in_String);
                 }
-            });
-            return stringType;
+                texts.push(span.literal.text);
+                types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
+            }
+            return isConstContext(node) ? getTemplateLiteralType(texts, types) : stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 278 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 281 /* 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;
@@ -69646,13 +71549,13 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 203 /* TypeAssertionExpression */ || node.kind === 221 /* AsExpression */;
+            return node.kind === 206 /* TypeAssertionExpression */ || node.kind === 224 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration, contextualType) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getQuickTypeOfExpression(initializer) ||
                 (contextualType ? checkExpressionWithContextualType(initializer, contextualType, /*inferenceContext*/ undefined, 0 /* Normal */) : checkExpressionCached(initializer));
-            return ts.isParameter(declaration) && declaration.name.kind === 194 /* ArrayBindingPattern */ &&
+            return ts.isParameter(declaration) && declaration.name.kind === 197 /* ArrayBindingPattern */ &&
                 isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
                 padTupleType(type, declaration.name) : type;
         }
@@ -69662,7 +71565,7 @@ var ts;
             var elementFlags = type.target.elementFlags.slice();
             for (var i = getTypeReferenceArity(type); i < patternElements.length; i++) {
                 var e = patternElements[i];
-                if (i < patternElements.length - 1 || !(e.kind === 195 /* BindingElement */ && e.dotDotDotToken)) {
+                if (i < patternElements.length - 1 || !(e.kind === 198 /* BindingElement */ && e.dotDotDotToken)) {
                     elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
                     elementFlags.push(2 /* Optional */);
                     if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
@@ -69705,7 +71608,7 @@ var ts;
                 }
                 // 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 */) ||
+                return !!(contextualType.flags & (128 /* StringLiteral */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && 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 */) ||
@@ -69717,7 +71620,7 @@ var ts;
             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);
+                (ts.isPropertyAssignment(parent) || ts.isShorthandPropertyAssignment(parent) || ts.isTemplateSpan(parent)) && isConstContext(parent.parent);
         }
         function checkExpressionForMutableLocation(node, checkMode, contextualType, forceTuple) {
             var type = checkExpression(node, checkMode, forceTuple);
@@ -69729,7 +71632,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 === 157 /* ComputedPropertyName */) {
+            if (node.name.kind === 158 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -69740,7 +71643,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 === 157 /* ComputedPropertyName */) {
+            if (node.name.kind === 158 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -69958,6 +71861,7 @@ var ts;
             }
         }
         function checkExpression(node, checkMode, forceTuple) {
+            ts.tracing.push("check" /* Check */, "checkExpression", { kind: node.kind, pos: node.pos, end: node.end });
             var saveCurrentNode = currentNode;
             currentNode = node;
             instantiationCount = 0;
@@ -69967,6 +71871,7 @@ var ts;
                 checkConstEnumAccess(node, type);
             }
             currentNode = saveCurrentNode;
+            ts.tracing.pop();
             return type;
         }
         function checkConstEnumAccess(node, type) {
@@ -69974,11 +71879,11 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 199 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 78 /* Identifier */ || node.kind === 156 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 175 /* TypeQuery */ && node.parent.exprName === node)) ||
-                (node.parent.kind === 267 /* ExportSpecifier */); // We allow reexporting const enums
+            var ok = (node.parent.kind === 201 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 202 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 78 /* Identifier */ || node.kind === 157 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 176 /* TypeQuery */ && node.parent.exprName === node)) ||
+                (node.parent.kind === 270 /* ExportSpecifier */); // We allow reexporting const enums
             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);
             }
@@ -70003,9 +71908,9 @@ 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 218 /* ClassExpression */:
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
+                    case 221 /* ClassExpression */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
@@ -70031,78 +71936,78 @@ var ts;
                     return trueType;
                 case 94 /* FalseKeyword */:
                     return falseType;
-                case 215 /* TemplateExpression */:
+                case 218 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 156 /* QualifiedName */:
+                case 157 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     if (node.expression.kind === 99 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 // falls through
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 218 /* ClassExpression */:
+                case 221 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 208 /* TypeOfExpression */:
+                case 211 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 203 /* TypeAssertionExpression */:
-                case 221 /* AsExpression */:
+                case 206 /* TypeAssertionExpression */:
+                case 224 /* AsExpression */:
                     return checkAssertion(node);
-                case 222 /* NonNullExpression */:
+                case 225 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 223 /* MetaProperty */:
+                case 226 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 207 /* DeleteExpression */:
+                case 210 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 209 /* VoidExpression */:
+                case 212 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 210 /* AwaitExpression */:
+                case 213 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 212 /* PostfixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 214 /* ConditionalExpression */:
+                case 217 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 217 /* SpreadElement */:
+                case 220 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 219 /* OmittedExpression */:
+                case 222 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 224 /* SyntheticExpression */:
+                case 227 /* SyntheticExpression */:
                     return checkSyntheticExpression(node);
-                case 280 /* JsxExpression */:
+                case 283 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 270 /* JsxElement */:
+                case 273 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 274 /* JsxFragment */:
+                case 277 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 278 /* JsxAttributes */:
+                case 281 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 272 /* JsxOpeningElement */:
+                case 275 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -70139,10 +72044,10 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 165 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 166 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
-                if (func.kind === 165 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                if (func.kind === 166 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
                     error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
                 }
             }
@@ -70153,13 +72058,13 @@ 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 === 165 /* Constructor */ || func.kind === 169 /* ConstructSignature */ || func.kind === 174 /* ConstructorType */) {
+                if (func.kind === 166 /* Constructor */ || func.kind === 170 /* ConstructSignature */ || func.kind === 175 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 206 /* ArrowFunction */) {
+                if (func.kind === 209 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 166 /* GetAccessor */ || func.kind === 167 /* SetAccessor */) {
+                if (func.kind === 167 /* GetAccessor */ || func.kind === 168 /* SetAccessor */) {
                     error(node, ts.Diagnostics.get_and_set_accessors_cannot_declare_this_parameters);
                 }
             }
@@ -70217,13 +72122,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 206 /* ArrowFunction */:
-                case 168 /* CallSignature */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 173 /* FunctionType */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 209 /* ArrowFunction */:
+                case 169 /* CallSignature */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 174 /* FunctionType */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -70241,7 +72146,7 @@ var ts;
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 194 /* ArrayBindingPattern */ || name.kind === 193 /* ObjectBindingPattern */) {
+                else if (name.kind === 197 /* ArrayBindingPattern */ || name.kind === 196 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -70250,13 +72155,13 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 170 /* IndexSignature */) {
+            if (node.kind === 171 /* 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 === 173 /* FunctionType */ || node.kind === 248 /* FunctionDeclaration */ || node.kind === 174 /* ConstructorType */ ||
-                node.kind === 168 /* CallSignature */ || node.kind === 165 /* Constructor */ ||
-                node.kind === 169 /* ConstructSignature */) {
+            else if (node.kind === 174 /* FunctionType */ || node.kind === 251 /* FunctionDeclaration */ || node.kind === 175 /* ConstructorType */ ||
+                node.kind === 169 /* CallSignature */ || node.kind === 166 /* Constructor */ ||
+                node.kind === 170 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
@@ -70286,10 +72191,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 169 /* ConstructSignature */:
+                        case 170 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 168 /* CallSignature */:
+                        case 169 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -70319,7 +72224,7 @@ var ts;
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 170 /* IndexSignature */ && node.kind !== 304 /* JSDocFunctionType */) {
+                if (node.kind !== 171 /* IndexSignature */ && node.kind !== 308 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -70331,7 +72236,7 @@ var ts;
             var privateIdentifiers = new ts.Map();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 165 /* Constructor */) {
+                if (member.kind === 166 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param, member) && !ts.isBindingPattern(param.name)) {
@@ -70351,16 +72256,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 166 /* GetAccessor */:
+                            case 167 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* GetAccessor */);
                                 break;
-                            case 167 /* SetAccessor */:
+                            case 168 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* SetAccessor */);
                                 break;
-                            case 162 /* PropertyDeclaration */:
+                            case 163 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* GetOrSetAccessor */);
                                 break;
-                            case 164 /* MethodDeclaration */:
+                            case 165 /* MethodDeclaration */:
                                 addName(names, name, memberName, 8 /* Method */);
                                 break;
                         }
@@ -70423,7 +72328,7 @@ var ts;
             var names = new ts.Map();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 161 /* PropertySignature */) {
+                if (member.kind === 162 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -70448,7 +72353,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 250 /* InterfaceDeclaration */) {
+            if (node.kind === 253 /* 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
@@ -70468,7 +72373,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 146 /* StringKeyword */:
+                            case 147 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -70476,7 +72381,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 143 /* NumberKeyword */:
+                            case 144 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -70518,7 +72423,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.hasSyntacticModifier(node, 128 /* Abstract */) && node.kind === 164 /* MethodDeclaration */ && node.body) {
+            if (ts.hasSyntacticModifier(node, 128 /* Abstract */) && node.kind === 165 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -70546,7 +72451,7 @@ var ts;
                 if (ts.isPrivateIdentifierPropertyDeclaration(n)) {
                     return true;
                 }
-                return n.kind === 162 /* PropertyDeclaration */ &&
+                return n.kind === 163 /* PropertyDeclaration */ &&
                     !ts.hasSyntacticModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -70577,7 +72482,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_4 = statements; _i < statements_4.length; _i++) {
                             var statement = statements_4[_i];
-                            if (statement.kind === 230 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 233 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -70602,7 +72507,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 166 /* GetAccessor */) {
+                if (node.kind === 167 /* GetAccessor */) {
                     if (!(node.flags & 8388608 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 256 /* HasImplicitReturn */)) {
                         if (!(node.flags & 512 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -70612,7 +72517,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 === 157 /* ComputedPropertyName */) {
+                if (node.name.kind === 158 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (ts.isPrivateIdentifier(node.name)) {
@@ -70621,7 +72526,7 @@ var ts;
                 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 === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */;
+                    var otherKind = node.kind === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getEffectiveModifierFlags(node);
@@ -70639,7 +72544,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 166 /* GetAccessor */) {
+                if (node.kind === 167 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -70687,7 +72592,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 172 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 173 /* 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);
             }
             ts.forEach(node.typeArguments, checkSourceElement);
@@ -70736,28 +72641,27 @@ var ts;
         function checkTupleType(node) {
             var elementTypes = node.elements;
             var seenOptionalElement = false;
-            var seenNamedElement = false;
+            var seenRestElement = false;
+            var hasNamedElement = ts.some(elementTypes, ts.isNamedTupleMember);
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 191 /* NamedTupleMember */) {
-                    seenNamedElement = true;
-                }
-                else if (seenNamedElement) {
+                if (e.kind !== 192 /* NamedTupleMember */ && hasNamedElement) {
                     grammarErrorOnNode(e, ts.Diagnostics.Tuple_members_must_all_have_names_or_all_not_have_names);
                     break;
                 }
                 var flags = getTupleElementFlags(e);
                 if (flags & 8 /* Variadic */) {
-                    if (!isArrayLikeType(getTypeFromTypeNode(e.type))) {
+                    var type = getTypeFromTypeNode(e.type);
+                    if (!isArrayLikeType(type)) {
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                         break;
                     }
+                    if (isArrayType(type) || isTupleType(type) && type.target.combinedFlags & 4 /* Rest */) {
+                        seenRestElement = true;
+                    }
                 }
                 else if (flags & 4 /* Rest */) {
-                    if (i !== elementTypes.length - 1) {
-                        grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
-                        break;
-                    }
+                    seenRestElement = true;
                 }
                 else if (flags & 2 /* Optional */) {
                     seenOptionalElement = true;
@@ -70766,11 +72670,17 @@ var ts;
                     grammarErrorOnNode(e, ts.Diagnostics.A_required_element_cannot_follow_an_optional_element);
                     break;
                 }
+                if (seenRestElement && i !== elementTypes.length - 1) {
+                    grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
+                    break;
+                }
             }
             ts.forEach(node.elements, checkSourceElement);
+            getTypeFromTypeNode(node);
         }
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
+            getTypeFromTypeNode(node);
         }
         function checkIndexedAccessIndexType(type, accessNode) {
             if (!(type.flags & 8388608 /* IndexedAccess */)) {
@@ -70780,7 +72690,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 199 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 202 /* 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));
                 }
@@ -70812,13 +72722,20 @@ var ts;
         }
         function checkMappedType(node) {
             checkSourceElement(node.typeParameter);
+            checkSourceElement(node.nameType);
             checkSourceElement(node.type);
             if (!node.type) {
                 reportImplicitAny(node, anyType);
             }
             var type = getTypeFromMappedTypeNode(node);
-            var constraintType = getConstraintTypeFromMappedType(type);
-            checkTypeAssignableTo(constraintType, keyofConstraintType, ts.getEffectiveConstraintOfTypeParameter(node.typeParameter));
+            var nameType = getNameTypeFromMappedType(type);
+            if (nameType) {
+                checkTypeAssignableTo(nameType, keyofConstraintType, node.nameType);
+            }
+            else {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                checkTypeAssignableTo(constraintType, keyofConstraintType, ts.getEffectiveConstraintOfTypeParameter(node.typeParameter));
+            }
         }
         function checkThisType(node) {
             getTypeFromThisTypeNode(node);
@@ -70831,12 +72748,21 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 183 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 184 /* 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 checkTemplateLiteralType(node) {
+            for (var _i = 0, _a = node.templateSpans; _i < _a.length; _i++) {
+                var span = _a[_i];
+                checkSourceElement(span.type);
+                var type = getTypeFromTypeNode(span.type);
+                checkTypeAssignableTo(type, templateConstraintType, span.type);
+            }
+            getTypeFromTypeNode(node);
+        }
         function checkImportType(node) {
             checkSourceElement(node.argument);
             getTypeFromTypeNode(node);
@@ -70845,10 +72771,10 @@ var ts;
             if (node.dotDotDotToken && node.questionToken) {
                 grammarErrorOnNode(node, ts.Diagnostics.A_tuple_member_cannot_be_both_optional_and_rest);
             }
-            if (node.type.kind === 179 /* OptionalType */) {
+            if (node.type.kind === 180 /* OptionalType */) {
                 grammarErrorOnNode(node.type, ts.Diagnostics.A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type);
             }
-            if (node.type.kind === 180 /* RestType */) {
+            if (node.type.kind === 181 /* RestType */) {
                 grammarErrorOnNode(node.type, ts.Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type);
             }
             checkSourceElement(node.type);
@@ -70861,9 +72787,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 !== 250 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 249 /* ClassDeclaration */ &&
-                n.parent.kind !== 218 /* ClassExpression */ &&
+            if (n.parent.kind !== 253 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 252 /* ClassDeclaration */ &&
+                n.parent.kind !== 221 /* ClassExpression */ &&
                 n.flags & 8388608 /* 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
@@ -70959,7 +72885,7 @@ var ts;
                             // Both are literal property names that are the same.
                             ts.isPropertyNameLiteral(node.name) && ts.isPropertyNameLiteral(subsequentName) &&
                                 ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 164 /* MethodDeclaration */ || node.kind === 163 /* MethodSignature */) &&
+                            var reportError = (node.kind === 165 /* MethodDeclaration */ || node.kind === 164 /* MethodSignature */) &&
                                 ts.hasSyntacticModifier(node, 32 /* Static */) !== ts.hasSyntacticModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -71000,7 +72926,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 8388608 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 250 /* InterfaceDeclaration */ || node.parent.kind === 176 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent && (node.parent.kind === 253 /* InterfaceDeclaration */ || node.parent.kind === 177 /* TypeLiteral */) || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -71011,10 +72937,10 @@ 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 === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */) && !inAmbientContext) {
+                if ((node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */) && !inAmbientContext) {
                     hasNonAmbientClass = true;
                 }
-                if (node.kind === 248 /* FunctionDeclaration */ || node.kind === 164 /* MethodDeclaration */ || node.kind === 163 /* MethodSignature */ || node.kind === 165 /* Constructor */) {
+                if (node.kind === 251 /* FunctionDeclaration */ || node.kind === 165 /* MethodDeclaration */ || node.kind === 164 /* MethodSignature */ || node.kind === 166 /* Constructor */) {
                     functionDeclarations.push(node);
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
@@ -71147,25 +73073,25 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 250 /* InterfaceDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases.
                     // falls through
-                    case 327 /* JSDocTypedefTag */:
-                    case 320 /* JSDocCallbackTag */:
-                    case 321 /* JSDocEnumTag */:
+                    case 331 /* JSDocTypedefTag */:
+                    case 324 /* JSDocCallbackTag */:
+                    case 325 /* JSDocEnumTag */:
                         return 2 /* ExportType */;
-                    case 253 /* ModuleDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 249 /* ClassDeclaration */:
-                    case 252 /* EnumDeclaration */:
-                    case 288 /* EnumMember */:
+                    case 252 /* ClassDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 291 /* EnumMember */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 294 /* SourceFile */:
+                    case 297 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 263 /* ExportAssignment */:
+                    case 266 /* 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 */;
@@ -71173,17 +73099,17 @@ var ts;
                         d = d.expression;
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module.
                     // falls through
-                    case 257 /* ImportEqualsDeclaration */:
-                    case 260 /* NamespaceImport */:
-                    case 259 /* ImportClause */:
-                        var result_11 = 0 /* None */;
+                    case 260 /* ImportEqualsDeclaration */:
+                    case 263 /* NamespaceImport */:
+                    case 262 /* ImportClause */:
+                        var result_12 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_11 |= getDeclarationSpaces(d); });
-                        return result_11;
-                    case 246 /* VariableDeclaration */:
-                    case 195 /* BindingElement */:
-                    case 248 /* FunctionDeclaration */:
-                    case 262 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_12 |= getDeclarationSpaces(d); });
+                        return result_12;
+                    case 249 /* VariableDeclaration */:
+                    case 198 /* BindingElement */:
+                    case 251 /* FunctionDeclaration */:
+                    case 265 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                     case 78 /* Identifier */: // https://github.com/microsoft/TypeScript/issues/36098
                         // Identifiers are used as declarations of assignment declarations whose parents may be
                         // SyntaxKind.CallExpression - `Object.defineProperty(thing, "aField", {value: 42});`
@@ -71476,24 +73402,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 159 /* Parameter */:
+                case 160 /* 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 162 /* PropertyDeclaration */:
+                case 163 /* 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 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -71540,30 +73466,30 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 182 /* IntersectionType */:
-                    case 181 /* UnionType */:
+                    case 183 /* IntersectionType */:
+                    case 182 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 183 /* ConditionalType */:
+                    case 184 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 185 /* ParenthesizedType */:
-                    case 191 /* NamedTupleMember */:
+                    case 186 /* ParenthesizedType */:
+                    case 192 /* NamedTupleMember */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 172 /* TypeReference */:
+                    case 173 /* TypeReference */:
                         return node.typeName;
                 }
             }
         }
         function getEntityNameForDecoratorMetadataFromTypeList(types) {
             var commonEntityName;
-            for (var _i = 0, types_20 = types; _i < types_20.length; _i++) {
-                var typeNode = types_20[_i];
-                while (typeNode.kind === 185 /* ParenthesizedType */ || typeNode.kind === 191 /* NamedTupleMember */) {
+            for (var _i = 0, types_21 = types; _i < types_21.length; _i++) {
+                var typeNode = types_21[_i];
+                while (typeNode.kind === 186 /* ParenthesizedType */ || typeNode.kind === 192 /* NamedTupleMember */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 140 /* NeverKeyword */) {
+                if (typeNode.kind === 141 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 190 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 149 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 191 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 150 /* 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);
@@ -71609,14 +73535,14 @@ var ts;
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 159 /* Parameter */) {
+            if (node.kind === 160 /* 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 249 /* ClassDeclaration */:
+                    case 252 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -71625,23 +73551,23 @@ var ts;
                             }
                         }
                         break;
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                        var otherKind = node.kind === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */;
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                        var otherKind = node.kind === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* 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 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 159 /* Parameter */:
+                    case 160 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -71704,7 +73630,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 === 156 /* 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 === 157 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -71748,7 +73674,7 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return node;
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -71761,7 +73687,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 === 157 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 158 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -71783,14 +73709,11 @@ var ts;
                     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);
-                    }
+                    // run check on export symbol to check that modifiers agree across all exported declarations
+                    checkFunctionOrConstructorSymbol(symbol);
                 }
             }
-            var body = node.kind === 163 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 164 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
             checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
@@ -71832,42 +73755,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 294 /* SourceFile */:
-                    case 253 /* ModuleDeclaration */:
-                    case 227 /* Block */:
-                    case 255 /* CaseBlock */:
-                    case 234 /* ForStatement */:
-                    case 235 /* ForInStatement */:
-                    case 236 /* ForOfStatement */:
+                    case 297 /* SourceFile */:
+                    case 256 /* ModuleDeclaration */:
+                    case 230 /* Block */:
+                    case 258 /* CaseBlock */:
+                    case 237 /* ForStatement */:
+                    case 238 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 165 /* Constructor */:
-                    case 205 /* FunctionExpression */:
-                    case 248 /* FunctionDeclaration */:
-                    case 206 /* ArrowFunction */:
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 166 /* Constructor */:
+                    case 208 /* FunctionExpression */:
+                    case 251 /* FunctionDeclaration */:
+                    case 209 /* ArrowFunction */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 163 /* MethodSignature */:
-                    case 168 /* CallSignature */:
-                    case 169 /* ConstructSignature */:
-                    case 173 /* FunctionType */:
-                    case 174 /* ConstructorType */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
+                    case 164 /* MethodSignature */:
+                    case 169 /* CallSignature */:
+                    case 170 /* ConstructSignature */:
+                    case 174 /* FunctionType */:
+                    case 175 /* ConstructorType */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 184 /* InferType */:
+                    case 185 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -71887,11 +73810,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 164 /* MethodDeclaration */:
-                    case 162 /* PropertyDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                        if (member.kind === 167 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 165 /* MethodDeclaration */:
+                    case 163 /* PropertyDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                        if (member.kind === 168 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -71902,7 +73825,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 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasSyntacticModifier(parameter, 8 /* Private */)) {
@@ -71910,8 +73833,8 @@ var ts;
                             }
                         }
                         break;
-                    case 170 /* IndexSignature */:
-                    case 226 /* SemicolonClassElement */:
+                    case 171 /* IndexSignature */:
+                    case 229 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -71938,7 +73861,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 184 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 185 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (ts.tryAddToSet(seenParentsWithEveryUnused, parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -72030,7 +73953,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 260 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 263 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -72048,7 +73971,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 === 246 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 247 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 249 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 250 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -72069,7 +73992,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 === 229 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 232 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -72083,22 +74006,22 @@ var ts;
             switch (name.kind) {
                 case 78 /* Identifier */:
                     return ts.idText(name);
-                case 194 /* ArrayBindingPattern */:
-                case 193 /* ObjectBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
+                case 196 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 259 /* ImportClause */ || node.kind === 262 /* ImportSpecifier */ || node.kind === 260 /* NamespaceImport */;
+            return node.kind === 262 /* ImportClause */ || node.kind === 265 /* ImportSpecifier */ || node.kind === 263 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 259 /* ImportClause */ ? decl : decl.kind === 260 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 262 /* ImportClause */ ? decl : decl.kind === 263 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 227 /* Block */) {
+            if (node.kind === 230 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -72128,12 +74051,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 162 /* PropertyDeclaration */ ||
-                node.kind === 161 /* PropertySignature */ ||
-                node.kind === 164 /* MethodDeclaration */ ||
-                node.kind === 163 /* MethodSignature */ ||
-                node.kind === 166 /* GetAccessor */ ||
-                node.kind === 167 /* SetAccessor */) {
+            if (node.kind === 163 /* PropertyDeclaration */ ||
+                node.kind === 162 /* PropertySignature */ ||
+                node.kind === 165 /* MethodDeclaration */ ||
+                node.kind === 164 /* MethodSignature */ ||
+                node.kind === 167 /* GetAccessor */ ||
+                node.kind === 168 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -72142,7 +74065,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 159 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 160 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -72199,7 +74122,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 === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 errorSkippedOn("noEmit", name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -72214,7 +74137,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 === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2048 /* HasAsyncFunctions */) {
+            if (parent.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2048 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 errorSkippedOn("noEmit", 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));
             }
@@ -72249,7 +74172,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 === 246 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 249 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -72261,17 +74184,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 247 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 229 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 250 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 232 /* 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 === 227 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 254 /* ModuleBlock */ ||
-                                container.kind === 253 /* ModuleDeclaration */ ||
-                                container.kind === 294 /* SourceFile */);
+                            (container.kind === 230 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 257 /* ModuleBlock */ ||
+                                container.kind === 256 /* ModuleDeclaration */ ||
+                                container.kind === 297 /* 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
@@ -72302,18 +74225,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 === 157 /* ComputedPropertyName */) {
+            if (node.name.kind === 158 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 195 /* BindingElement */) {
-                if (node.parent.kind === 193 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
+            if (node.kind === 198 /* BindingElement */) {
+                if (node.parent.kind === 196 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 157 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 158 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -72334,19 +74257,19 @@ var ts;
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 194 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 197 /* 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 === 159 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.isParameterDeclaration(node) && 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)) {
-                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 235 /* ForInStatement */;
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 238 /* ForInStatement */;
                 var needCheckWidenedType = node.name.elements.length === 0;
                 if (needCheckInitializer || needCheckWidenedType) {
                     // Don't validate for-in initializer as it is already an error
@@ -72372,7 +74295,12 @@ var ts;
                 }
                 return;
             }
+            // For a commonjs `const x = require`, validate the alias and exit
             var symbol = getSymbolOfNode(node);
+            if (symbol.flags & 2097152 /* Alias */ && ts.isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true)) {
+                checkAliasSymbol(node);
+                return;
+            }
             var type = convertAutoToAny(getTypeOfSymbol(symbol));
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
@@ -72383,7 +74311,7 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         !!((_a = symbol.exports) === null || _a === void 0 ? void 0 : _a.size);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 235 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 238 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
                     }
                 }
@@ -72409,10 +74337,10 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 162 /* PropertyDeclaration */ && node.kind !== 161 /* PropertySignature */) {
+            if (node.kind !== 163 /* PropertyDeclaration */ && node.kind !== 162 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) {
+                if (node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
@@ -72424,7 +74352,7 @@ var ts;
         }
         function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 162 /* PropertyDeclaration */ || nextDeclaration.kind === 161 /* PropertySignature */
+            var message = nextDeclaration.kind === 163 /* PropertyDeclaration */ || nextDeclaration.kind === 162 /* 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;
             var declName = ts.declarationNameToString(nextDeclarationName);
@@ -72434,8 +74362,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 159 /* Parameter */ && right.kind === 246 /* VariableDeclaration */) ||
-                (left.kind === 246 /* VariableDeclaration */ && right.kind === 159 /* Parameter */)) {
+            if ((left.kind === 160 /* Parameter */ && right.kind === 249 /* VariableDeclaration */) ||
+                (left.kind === 249 /* VariableDeclaration */ && right.kind === 160 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -72451,8 +74379,10 @@ var ts;
             return ts.getSelectedEffectiveModifierFlags(left, interestingFlags) === ts.getSelectedEffectiveModifierFlags(right, interestingFlags);
         }
         function checkVariableDeclaration(node) {
+            ts.tracing.push("check" /* Check */, "checkVariableDeclaration", { kind: node.kind, pos: node.pos, end: node.end });
             checkGrammarVariableDeclaration(node);
-            return checkVariableLikeDeclaration(node);
+            checkVariableLikeDeclaration(node);
+            ts.tracing.pop();
         }
         function checkBindingElement(node) {
             checkGrammarBindingElement(node);
@@ -72475,7 +74405,7 @@ var ts;
             var type = checkTruthinessExpression(node.expression);
             checkTestingKnownTruthyCallableType(node.expression, node.thenStatement, type);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 228 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 231 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -72568,12 +74498,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 247 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 250 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 247 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 250 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -72607,14 +74537,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 === 247 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 250 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 196 /* ArrayLiteralExpression */ || varExpr.kind === 197 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 199 /* ArrayLiteralExpression */ || varExpr.kind === 200 /* 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.
@@ -72646,7 +74576,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 === 247 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 250 /* 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);
@@ -72660,7 +74590,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 === 196 /* ArrayLiteralExpression */ || varExpr.kind === 197 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 199 /* ArrayLiteralExpression */ || varExpr.kind === 200 /* 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)) {
@@ -72712,6 +74642,7 @@ var ts;
             }
             var uplevelIteration = languageVersion >= 2 /* ES2015 */;
             var downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
+            var possibleOutOfBounds = compilerOptions.noUncheckedIndexedAccess && !!(use & 128 /* PossiblyOutOfBounds */);
             // 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.
@@ -72731,7 +74662,7 @@ var ts;
                     }
                 }
                 if (iterationTypes || uplevelIteration) {
-                    return iterationTypes && iterationTypes.yieldType;
+                    return possibleOutOfBounds ? includeUndefinedInIndexSignature(iterationTypes && iterationTypes.yieldType) : (iterationTypes && iterationTypes.yieldType);
                 }
             }
             var arrayType = inputType;
@@ -72745,12 +74676,12 @@ var ts;
                     // 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 */); });
+                    var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 402653316 /* StringLike */); });
                     if (filteredTypes !== arrayTypes) {
                         arrayType = getUnionType(filteredTypes, 2 /* Subtype */);
                     }
                 }
-                else if (arrayType.flags & 132 /* StringLike */) {
+                else if (arrayType.flags & 402653316 /* StringLike */) {
                     arrayType = neverType;
                 }
                 hasStringConstituent = arrayType !== inputType;
@@ -72764,7 +74695,7 @@ var ts;
                     // 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;
+                        return possibleOutOfBounds ? includeUndefinedInIndexSignature(stringType) : stringType;
                     }
                 }
             }
@@ -72789,17 +74720,17 @@ var ts;
                                 : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
                     errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
-                return hasStringConstituent ? stringType : undefined;
+                return hasStringConstituent ? possibleOutOfBounds ? includeUndefinedInIndexSignature(stringType) : 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 */) {
+                if (arrayElementType.flags & 402653316 /* StringLike */ && !compilerOptions.noUncheckedIndexedAccess) {
                     return stringType;
                 }
-                return getUnionType([arrayElementType, stringType], 2 /* Subtype */);
+                return getUnionType(possibleOutOfBounds ? [arrayElementType, stringType, undefinedType] : [arrayElementType, stringType], 2 /* Subtype */);
             }
-            return arrayElementType;
+            return (use & 128 /* PossiblyOutOfBounds */) ? includeUndefinedInIndexSignature(arrayElementType) : arrayElementType;
         }
         /**
          * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
@@ -72915,8 +74846,9 @@ var ts;
                 if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
                         reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
-                        errorNode = undefined;
                     }
+                    setCachedIterationTypes(type, cacheKey, noIterationTypes);
+                    return undefined;
                 }
                 else {
                     allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
@@ -73194,6 +75126,7 @@ var ts;
          * record is returned. Otherwise, we return `undefined`.
          */
         function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var _a, _b, _c, _d;
             var method = getPropertyOfType(type, methodName);
             // Ignore 'return' or 'throw' if they are missing.
             if (!method && methodName !== "next") {
@@ -73217,6 +75150,24 @@ var ts;
                 }
                 return methodName === "next" ? anyIterationTypes : undefined;
             }
+            // If the method signature comes exclusively from the global iterator or generator type,
+            // create iteration types from its type arguments like `getIterationTypesOfIteratorFast`
+            // does (so as to remove `undefined` from the next and return types). We arrive here when
+            // a contextual type for a generator was not a direct reference to one of those global types,
+            // but looking up `methodType` referred to one of them (and nothing else). E.g., in
+            // `interface SpecialIterator extends Iterator<number> {}`, `SpecialIterator` is not a
+            // reference to `Iterator`, but its `next` member derives exclusively from `Iterator`.
+            if ((methodType === null || methodType === void 0 ? void 0 : methodType.symbol) && methodSignatures.length === 1) {
+                var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+                var globalIteratorType = resolver.getGlobalIteratorType(/*reportErrors*/ false);
+                var isGeneratorMethod = ((_b = (_a = globalGeneratorType.symbol) === null || _a === void 0 ? void 0 : _a.members) === null || _b === void 0 ? void 0 : _b.get(methodName)) === methodType.symbol;
+                var isIteratorMethod = !isGeneratorMethod && ((_d = (_c = globalIteratorType.symbol) === null || _c === void 0 ? void 0 : _c.members) === null || _d === void 0 ? void 0 : _d.get(methodName)) === methodType.symbol;
+                if (isGeneratorMethod || isIteratorMethod) {
+                    var globalType = isGeneratorMethod ? globalGeneratorType : globalIteratorType;
+                    var mapper = methodType.mapper;
+                    return createIterationTypes(getMappedType(globalType.typeParameters[0], mapper), getMappedType(globalType.typeParameters[1], mapper), methodName === "next" ? getMappedType(globalType.typeParameters[2], mapper) : undefined);
+                }
+            }
             // Extract the first parameter and return type of each signature.
             var methodParameterTypes;
             var methodReturnTypes;
@@ -73334,12 +75285,12 @@ var ts;
             var functionFlags = ts.getFunctionFlags(func);
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (func.kind === 167 /* SetAccessor */) {
+                if (func.kind === 168 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 165 /* Constructor */) {
+                else if (func.kind === 166 /* 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);
                     }
@@ -73357,7 +75308,7 @@ var ts;
                     }
                 }
             }
-            else if (func.kind !== 165 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+            else if (func.kind !== 166 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // 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);
             }
@@ -73386,7 +75337,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 === 282 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 285 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -73395,7 +75346,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 281 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 284 /* 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.
@@ -73427,7 +75378,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 242 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 245 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -73456,11 +75407,15 @@ var ts;
             if (catchClause) {
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.type && getTypeOfNode(catchClause.variableDeclaration) === errorType) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified);
+                    var declaration = catchClause.variableDeclaration;
+                    if (declaration.type) {
+                        var type = getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ false);
+                        if (type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                            grammarErrorOnFirstToken(declaration.type, ts.Diagnostics.Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified);
+                        }
                     }
-                    else if (catchClause.variableDeclaration.initializer) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
+                    else if (declaration.initializer) {
+                        grammarErrorOnFirstToken(declaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
                         var blockLocals_1 = catchClause.block.locals;
@@ -73537,8 +75492,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 === 213 /* BinaryExpression */ ||
-                        name.kind === 157 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 216 /* BinaryExpression */ ||
+                        name.kind === 158 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -73615,7 +75570,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 172 /* TypeReference */) {
+                if (node.kind === 173 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -73726,6 +75681,7 @@ var ts;
             var typeWithThis = getTypeWithThisArgument(type);
             var staticType = getTypeOfSymbol(symbol);
             checkTypeParameterListsIdentical(symbol);
+            checkFunctionOrConstructorSymbol(symbol);
             checkClassForDuplicateDeclarations(node);
             // Only check for reserved static identifiers on non-ambient context.
             if (!(node.flags & 8388608 /* Ambient */)) {
@@ -73816,7 +75772,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_22 = function (member) {
+            var _loop_23 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -73835,7 +75791,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_22(member);
+                _loop_23(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -73861,7 +75817,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 249 /* ClassDeclaration */ || d.kind === 250 /* InterfaceDeclaration */;
+                return d.kind === 252 /* ClassDeclaration */ || d.kind === 253 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -73916,7 +75872,7 @@ var ts;
                                 continue basePropertyCheck;
                             }
                         }
-                        if (derivedClassDecl.kind === 218 /* ClassExpression */) {
+                        if (derivedClassDecl.kind === 221 /* ClassExpression */) {
                             error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                         }
                         else {
@@ -73937,7 +75893,7 @@ var ts;
                     if (basePropertyFlags && derivedPropertyFlags) {
                         // property/accessor is overridden with property/accessor
                         if (baseDeclarationFlags & 128 /* Abstract */ && !(base.valueDeclaration && ts.isPropertyDeclaration(base.valueDeclaration) && base.valueDeclaration.initializer)
-                            || base.valueDeclaration && base.valueDeclaration.parent.kind === 250 /* InterfaceDeclaration */
+                            || base.valueDeclaration && base.valueDeclaration.parent.kind === 253 /* InterfaceDeclaration */
                             || derived.valueDeclaration && ts.isBinaryExpression(derived.valueDeclaration)) {
                             // when the base property is abstract or from an interface, base/derived flags don't need to match
                             // same when the derived property is from an assignment
@@ -73952,7 +75908,7 @@ var ts;
                             error(ts.getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage_1, symbolToString(base), typeToString(baseType), typeToString(type));
                         }
                         else if (compilerOptions.useDefineForClassFields) {
-                            var uninitialized = ts.find(derived.declarations, function (d) { return d.kind === 162 /* PropertyDeclaration */ && !d.initializer; });
+                            var uninitialized = ts.find(derived.declarations, function (d) { return d.kind === 163 /* PropertyDeclaration */ && !d.initializer; });
                             if (uninitialized
                                 && !(derived.flags & 33554432 /* Transient */)
                                 && !(baseDeclarationFlags & 128 /* Abstract */)
@@ -74068,7 +76024,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 162 /* PropertyDeclaration */ &&
+            return node.kind === 163 /* PropertyDeclaration */ &&
                 !ts.hasSyntacticModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -74092,7 +76048,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 250 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 253 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -74125,8 +76081,15 @@ var ts;
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
             checkExportsOnMergedDeclarations(node);
             checkTypeParameters(node.typeParameters);
-            checkSourceElement(node.type);
-            registerForUnusedIdentifiersCheck(node);
+            if (node.type.kind === 136 /* IntrinsicKeyword */) {
+                if (!intrinsicTypeKinds.has(node.name.escapedText) || ts.length(node.typeParameters) !== 1) {
+                    error(node.type, ts.Diagnostics.The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types);
+                }
+            }
+            else {
+                checkSourceElement(node.type);
+                registerForUnusedIdentifiersCheck(node);
+            }
         }
         function computeEnumMemberValues(node) {
             var nodeLinks = getNodeLinks(node);
@@ -74204,7 +76167,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 211 /* PrefixUnaryExpression */:
+                    case 214 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -74214,7 +76177,7 @@ var ts;
                             }
                         }
                         break;
-                    case 213 /* BinaryExpression */:
+                    case 216 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -74243,7 +76206,7 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 204 /* ParenthesizedExpression */:
+                    case 207 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
                     case 78 /* Identifier */:
                         var identifier = expr;
@@ -74251,14 +76214,14 @@ var ts;
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 199 /* ElementAccessExpression */:
-                    case 198 /* PropertyAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
+                    case 201 /* 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 === 198 /* PropertyAccessExpression */) {
+                                if (ex.kind === 201 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -74291,8 +76254,8 @@ var ts;
         }
         function isConstantMemberAccess(node) {
             return node.kind === 78 /* Identifier */ ||
-                node.kind === 198 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 199 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+                node.kind === 201 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 202 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     ts.isStringLiteralLike(node.argumentExpression);
         }
         function checkEnumDeclaration(node) {
@@ -74328,7 +76291,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 !== 252 /* EnumDeclaration */) {
+                    if (declaration.kind !== 255 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -74356,8 +76319,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 === 249 /* ClassDeclaration */ ||
-                    (declaration.kind === 248 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 252 /* ClassDeclaration */ ||
+                    (declaration.kind === 251 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 8388608 /* Ambient */)) {
                     return declaration;
                 }
@@ -74420,7 +76383,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, 249 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 252 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -74470,23 +76433,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 229 /* VariableStatement */:
+                case 232 /* 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 263 /* ExportAssignment */:
-                case 264 /* ExportDeclaration */:
+                case 266 /* ExportAssignment */:
+                case 267 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 257 /* ImportEqualsDeclaration */:
-                case 258 /* ImportDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 195 /* BindingElement */:
-                case 246 /* VariableDeclaration */:
+                case 198 /* BindingElement */:
+                case 249 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -74497,12 +76460,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 249 /* ClassDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 248 /* FunctionDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -74525,12 +76488,12 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return node;
-                case 156 /* QualifiedName */:
+                case 157 /* QualifiedName */:
                     do {
                         node = node.left;
                     } while (node.kind !== 78 /* Identifier */);
                     return node;
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     do {
                         if (ts.isModuleExportsAccessExpression(node.expression) && !ts.isPrivateIdentifier(node.name)) {
                             return node.name;
@@ -74550,9 +76513,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 254 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 294 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 264 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 257 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 297 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 267 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -74586,14 +76549,14 @@ var ts;
                     (symbol.flags & 788968 /* Type */ ? 788968 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 267 /* ExportSpecifier */ ?
+                    var message = node.kind === 270 /* 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 === 267 /* ExportSpecifier */
+                    && node.kind === 270 /* ExportSpecifier */
                     && !node.parent.parent.isTypeOnly
                     && !(target.flags & 111551 /* Value */)
                     && !(node.flags & 8388608 /* Ambient */)) {
@@ -74608,7 +76571,7 @@ var ts;
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
             checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
-            if (node.kind === 262 /* ImportSpecifier */ &&
+            if (node.kind === 265 /* ImportSpecifier */ &&
                 ts.idText(node.propertyName || node.name) === "default" &&
                 compilerOptions.esModuleInterop &&
                 moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015) {
@@ -74630,7 +76593,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 260 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 263 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                             if (moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015 && compilerOptions.esModuleInterop) {
                                 // import * as ns from "foo";
@@ -74658,7 +76621,7 @@ var ts;
                 if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 269 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 272 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 111551 /* Value */) {
@@ -74698,10 +76661,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 254 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 254 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 257 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 257 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 8388608 /* Ambient */;
-                    if (node.parent.kind !== 294 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 297 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -74734,14 +76697,14 @@ var ts;
         }
         function checkGrammarExportDeclaration(node) {
             var _a;
-            var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 265 /* NamedExports */;
+            var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 268 /* NamedExports */;
             if (isTypeOnlyExportStar) {
                 grammarErrorOnNode(node, ts.Diagnostics.Only_named_exports_may_use_export_type);
             }
             return !isTypeOnlyExportStar;
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 294 /* SourceFile */ || node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 253 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 297 /* SourceFile */ || node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 256 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -74805,8 +76768,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 === 294 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 253 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 297 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 256 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -74831,6 +76794,9 @@ var ts;
                         checkExpressionCached(node.expression);
                     }
                 }
+                else {
+                    checkExpressionCached(node.expression); // doesn't resolve, check as expression to mark as error
+                }
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
@@ -74920,169 +76886,171 @@ 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 253 /* ModuleDeclaration */:
-                    case 249 /* ClassDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 248 /* FunctionDeclaration */:
+                    case 256 /* ModuleDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 251 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
-            if (kind >= 229 /* FirstStatement */ && kind <= 245 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) {
+            if (kind >= 232 /* FirstStatement */ && kind <= 248 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) {
                 errorOrSuggestion(compilerOptions.allowUnreachableCode === false, node, ts.Diagnostics.Unreachable_code_detected);
             }
             switch (kind) {
-                case 158 /* TypeParameter */:
+                case 159 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return checkParameter(node);
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return checkPropertyDeclaration(node);
-                case 161 /* PropertySignature */:
+                case 162 /* PropertySignature */:
                     return checkPropertySignature(node);
-                case 173 /* FunctionType */:
-                case 174 /* ConstructorType */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 170 /* IndexSignature */:
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 171 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 171 /* TypePredicate */:
+                case 172 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 175 /* TypeQuery */:
+                case 176 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 176 /* TypeLiteral */:
+                case 177 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 177 /* ArrayType */:
+                case 178 /* ArrayType */:
                     return checkArrayType(node);
-                case 178 /* TupleType */:
+                case 179 /* TupleType */:
                     return checkTupleType(node);
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 185 /* ParenthesizedType */:
-                case 179 /* OptionalType */:
-                case 180 /* RestType */:
+                case 186 /* ParenthesizedType */:
+                case 180 /* OptionalType */:
+                case 181 /* RestType */:
                     return checkSourceElement(node.type);
-                case 186 /* ThisType */:
+                case 187 /* ThisType */:
                     return checkThisType(node);
-                case 187 /* TypeOperator */:
+                case 188 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 183 /* ConditionalType */:
+                case 184 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 184 /* InferType */:
+                case 185 /* InferType */:
                     return checkInferType(node);
-                case 192 /* ImportType */:
+                case 193 /* TemplateLiteralType */:
+                    return checkTemplateLiteralType(node);
+                case 195 /* ImportType */:
                     return checkImportType(node);
-                case 191 /* NamedTupleMember */:
+                case 192 /* NamedTupleMember */:
                     return checkNamedTupleMember(node);
-                case 311 /* JSDocAugmentsTag */:
+                case 315 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 312 /* JSDocImplementsTag */:
+                case 316 /* JSDocImplementsTag */:
                     return checkJSDocImplementsTag(node);
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 321 /* JSDocEnumTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 325 /* JSDocEnumTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 326 /* JSDocTemplateTag */:
+                case 330 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 325 /* JSDocTypeTag */:
+                case 329 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 322 /* JSDocParameterTag */:
+                case 326 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 328 /* JSDocPropertyTag */:
+                case 333 /* JSDocPropertyTag */:
                     return checkJSDocPropertyTag(node);
-                case 304 /* JSDocFunctionType */:
+                case 308 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 302 /* JSDocNonNullableType */:
-                case 301 /* JSDocNullableType */:
-                case 299 /* JSDocAllType */:
-                case 300 /* JSDocUnknownType */:
-                case 308 /* JSDocTypeLiteral */:
+                case 306 /* JSDocNonNullableType */:
+                case 305 /* JSDocNullableType */:
+                case 303 /* JSDocAllType */:
+                case 304 /* JSDocUnknownType */:
+                case 312 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 305 /* JSDocVariadicType */:
+                case 309 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 298 /* JSDocTypeExpression */:
+                case 301 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 188 /* IndexedAccessType */:
+                case 189 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 189 /* MappedType */:
+                case 190 /* MappedType */:
                     return checkMappedType(node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 227 /* Block */:
-                case 254 /* ModuleBlock */:
+                case 230 /* Block */:
+                case 257 /* ModuleBlock */:
                     return checkBlock(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 231 /* IfStatement */:
+                case 234 /* IfStatement */:
                     return checkIfStatement(node);
-                case 232 /* DoStatement */:
+                case 235 /* DoStatement */:
                     return checkDoStatement(node);
-                case 233 /* WhileStatement */:
+                case 236 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return checkForStatement(node);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 237 /* ContinueStatement */:
-                case 238 /* BreakStatement */:
+                case 240 /* ContinueStatement */:
+                case 241 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 240 /* WithStatement */:
+                case 243 /* WithStatement */:
                     return checkWithStatement(node);
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 243 /* ThrowStatement */:
+                case 246 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 244 /* TryStatement */:
+                case 247 /* TryStatement */:
                     return checkTryStatement(node);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return checkBindingElement(node);
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 228 /* EmptyStatement */:
-                case 245 /* DebuggerStatement */:
+                case 231 /* EmptyStatement */:
+                case 248 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 268 /* MissingDeclaration */:
+                case 271 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -75177,43 +77145,46 @@ var ts;
             currentNode = node;
             instantiationCount = 0;
             switch (node.kind) {
-                case 200 /* CallExpression */:
-                case 201 /* NewExpression */:
-                case 202 /* TaggedTemplateExpression */:
-                case 160 /* Decorator */:
-                case 272 /* JsxOpeningElement */:
+                case 203 /* CallExpression */:
+                case 204 /* NewExpression */:
+                case 205 /* TaggedTemplateExpression */:
+                case 161 /* Decorator */:
+                case 275 /* JsxOpeningElement */:
                     // These node kinds are deferred checked when overload resolution fails
                     // To save on work, we ensure the arguments are checked just once, in
                     // a deferred way
                     resolveUntypedCall(node);
                     break;
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 218 /* ClassExpression */:
+                case 221 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 270 /* JsxElement */:
+                case 273 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
             currentNode = saveCurrentNode;
         }
         function checkSourceFile(node) {
+            var tracingData = ["check" /* Check */, "checkSourceFile", { path: node.path }];
+            ts.tracing.begin.apply(ts.tracing, tracingData);
             ts.performance.mark("beforeCheck");
             checkSourceFileWorker(node);
             ts.performance.mark("afterCheck");
             ts.performance.measure("Check", "beforeCheck", "afterCheck");
+            ts.tracing.end.apply(ts.tracing, tracingData);
         }
         function unusedIsError(kind, isAmbient) {
             if (isAmbient) {
@@ -75346,17 +77317,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 294 /* SourceFile */:
+                        case 297 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 253 /* ModuleDeclaration */:
+                        case 256 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 252 /* EnumDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 218 /* ClassExpression */:
+                        case 221 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -75364,8 +77335,8 @@ var ts;
                         // 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.
                         // falls through
-                        case 249 /* ClassDeclaration */:
-                        case 250 /* InterfaceDeclaration */:
+                        case 252 /* ClassDeclaration */:
+                        case 253 /* 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.
@@ -75374,7 +77345,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 788968 /* Type */);
                             }
                             break;
-                        case 205 /* FunctionExpression */:
+                        case 208 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -75422,19 +77393,19 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 158 /* TypeParameter */:
-                case 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 321 /* JSDocEnumTag */:
+                case 159 /* TypeParameter */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 325 /* JSDocEnumTag */:
                     return true;
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     return node.isTypeOnly;
-                case 262 /* ImportSpecifier */:
-                case 267 /* ExportSpecifier */:
+                case 265 /* ImportSpecifier */:
+                case 270 /* ExportSpecifier */:
                     return node.parent.parent.isTypeOnly;
                 default:
                     return false;
@@ -75442,16 +77413,25 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 156 /* QualifiedName */) {
+            while (node.parent.kind === 157 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 172 /* TypeReference */;
+            return node.parent.kind === 173 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 198 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 201 /* PropertyAccessExpression */) {
+                node = node.parent;
+            }
+            return node.parent.kind === 223 /* ExpressionWithTypeArguments */;
+        }
+        function isJSDocEntryNameReference(node) {
+            while (node.parent.kind === 157 /* QualifiedName */) {
+                node = node.parent;
+            }
+            while (node.parent.kind === 201 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 220 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 302 /* JSDocNameReference */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -75479,13 +77459,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 156 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 157 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 257 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 260 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 263 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 266 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -75511,7 +77491,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 192 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 195 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -75521,7 +77501,7 @@ var ts;
                 return getSymbolOfNode(name.parent);
             }
             if (ts.isInJSFile(name) &&
-                name.parent.kind === 198 /* PropertyAccessExpression */ &&
+                name.parent.kind === 201 /* PropertyAccessExpression */ &&
                 name.parent === name.parent.parent.left) {
                 // Check if this is a special property assignment
                 if (!ts.isPrivateIdentifier(name)) {
@@ -75531,7 +77511,7 @@ var ts;
                     }
                 }
             }
-            if (name.parent.kind === 263 /* ExportAssignment */ && ts.isEntityNameExpression(name)) {
+            if (name.parent.kind === 266 /* ExportAssignment */ && ts.isEntityNameExpression(name)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(name, 
                 /*all meanings*/ 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -75541,7 +77521,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(name) && !ts.isPrivateIdentifier(name) && isInRightSideOfImportOrExportAssignment(name)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(name, 257 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(name, 260 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(name, /*dontResolveAlias*/ true);
             }
@@ -75559,7 +77539,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(name)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (name.parent.kind === 220 /* ExpressionWithTypeArguments */) {
+                if (name.parent.kind === 223 /* ExpressionWithTypeArguments */) {
                     meaning = 788968 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(name.parent)) {
@@ -75575,10 +77555,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (name.parent.kind === 322 /* JSDocParameterTag */) {
+            if (name.parent.kind === 326 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(name.parent);
             }
-            if (name.parent.kind === 158 /* TypeParameter */ && name.parent.parent.kind === 326 /* JSDocTemplateTag */) {
+            if (name.parent.kind === 159 /* TypeParameter */ && name.parent.parent.kind === 330 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(name)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(name.parent);
                 return typeParameter && typeParameter.symbol;
@@ -75595,12 +77575,12 @@ var ts;
                     }
                     return resolveEntityName(name, 111551 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (name.kind === 198 /* PropertyAccessExpression */ || name.kind === 156 /* QualifiedName */) {
+                else if (name.kind === 201 /* PropertyAccessExpression */ || name.kind === 157 /* QualifiedName */) {
                     var links = getNodeLinks(name);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (name.kind === 198 /* PropertyAccessExpression */) {
+                    if (name.kind === 201 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(name);
                     }
                     else {
@@ -75610,17 +77590,21 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(name)) {
-                var meaning = name.parent.kind === 172 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */;
+                var meaning = name.parent.kind === 173 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (name.parent.kind === 171 /* TypePredicate */) {
+            else if (isJSDocEntryNameReference(name)) {
+                var meaning = 788968 /* Type */ | 1920 /* Namespace */ | 111551 /* Value */;
+                return resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true, ts.getHostSignatureFromJSDoc(name));
+            }
+            if (name.parent.kind === 172 /* TypePredicate */) {
                 return resolveEntityName(name, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node, ignoreErrors) {
-            if (node.kind === 294 /* SourceFile */) {
+            if (node.kind === 297 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -75643,8 +77627,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 195 /* BindingElement */ &&
-                    grandParent.kind === 193 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 198 /* BindingElement */ &&
+                    grandParent.kind === 196 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -75656,8 +77640,8 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                 case 79 /* PrivateIdentifier */:
-                case 198 /* PropertyAccessExpression */:
-                case 156 /* QualifiedName */:
+                case 201 /* PropertyAccessExpression */:
+                case 157 /* QualifiedName */:
                     return getSymbolOfNameOrPropertyAccessExpression(node);
                 case 107 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
@@ -75671,14 +77655,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 186 /* ThisType */:
+                case 187 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
                 case 105 /* SuperKeyword */:
                     return checkExpression(node).symbol;
                 case 132 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 165 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 166 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -75689,7 +77673,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 === 258 /* ImportDeclaration */ || node.parent.kind === 264 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 261 /* ImportDeclaration */ || node.parent.kind === 267 /* 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, ignoreErrors);
@@ -75711,7 +77695,7 @@ var ts;
                 case 38 /* EqualsGreaterThanToken */:
                 case 83 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 192 /* ImportType */:
+                case 195 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal, ignoreErrors) : undefined;
                 case 92 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.checkDefined(node.parent.symbol) : undefined;
@@ -75720,18 +77704,26 @@ var ts;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 286 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 289 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 111551 /* 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, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
+            if (ts.isExportSpecifier(node)) {
+                return node.parent.parent.moduleSpecifier ?
+                    getExternalModuleMember(node.parent.parent, node) :
+                    resolveEntityName(node.propertyName || node.name, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
+            }
+            else {
+                return resolveEntityName(node, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
+            }
         }
         function getTypeOfNode(node) {
+            if (ts.isSourceFile(node) && !ts.isExternalModule(node)) {
+                return errorType;
+            }
             if (node.flags & 16777216 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return errorType;
@@ -75791,23 +77783,23 @@ var ts;
         // [ a ] from
         //     [a] = [ some array ...]
         function getTypeOfAssignmentPattern(expr) {
-            ts.Debug.assert(expr.kind === 197 /* ObjectLiteralExpression */ || expr.kind === 196 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.kind === 200 /* ObjectLiteralExpression */ || expr.kind === 199 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 236 /* ForOfStatement */) {
+            if (expr.parent.kind === 239 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 213 /* BinaryExpression */) {
+            if (expr.parent.kind === 216 /* 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 === 285 /* PropertyAssignment */) {
+            if (expr.parent.kind === 288 /* PropertyAssignment */) {
                 var node_2 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
                 var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_2) || errorType;
                 var propertyIndex = ts.indexOfNode(node_2.properties, expr.parent);
@@ -75855,7 +77847,7 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -75972,7 +77964,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 294 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 297 /* 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.
@@ -75987,6 +77979,9 @@ var ts;
         // 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) {
+            if (nodeIn.generatedImportReference) {
+                return nodeIn.generatedImportReference;
+            }
             var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
             if (node) {
                 var symbol = getReferencedValueSymbol(node);
@@ -76000,7 +77995,7 @@ var ts;
         }
         function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
             return ts.isBindingElement(symbol.valueDeclaration)
-                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 284 /* CatchClause */;
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 287 /* CatchClause */;
         }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
@@ -76031,7 +78026,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 === 227 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 230 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -76072,19 +78067,19 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 259 /* ImportClause */:
-                case 260 /* NamespaceImport */:
-                case 262 /* ImportSpecifier */:
-                case 267 /* ExportSpecifier */:
+                case 262 /* ImportClause */:
+                case 263 /* NamespaceImport */:
+                case 265 /* ImportSpecifier */:
+                case 270 /* ExportSpecifier */:
                     var symbol = getSymbolOfNode(node) || unknownSymbol;
                     return isAliasResolvedToValue(symbol) && !getTypeOnlyAliasDeclaration(symbol);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && (ts.isNamespaceExport(exportClause) ||
                         ts.some(exportClause.elements, isValueAliasDeclaration));
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return node.expression && node.expression.kind === 78 /* Identifier */ ?
                         isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol) :
                         true;
@@ -76093,7 +78088,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 294 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 297 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -76200,15 +78195,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 288 /* EnumMember */:
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
+                case 291 /* EnumMember */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 288 /* EnumMember */) {
+            if (node.kind === 291 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -76274,7 +78269,7 @@ var ts;
             else if (isTypeAssignableToKind(type, 2112 /* BigIntLike */)) {
                 return ts.TypeReferenceSerializationKind.BigIntLikeType;
             }
-            else if (isTypeAssignableToKind(type, 132 /* StringLike */)) {
+            else if (isTypeAssignableToKind(type, 402653316 /* StringLike */)) {
                 return ts.TypeReferenceSerializationKind.StringLikeType;
             }
             else if (isTupleType(type)) {
@@ -76477,12 +78472,12 @@ var ts;
                 getJsxFragmentFactoryEntity: getJsxFragmentFactoryEntity,
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 167 /* SetAccessor */ ? 166 /* GetAccessor */ : 167 /* SetAccessor */;
+                    var otherKind = accessor.kind === 168 /* SetAccessor */ ? 167 /* GetAccessor */ : 168 /* 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 === 167 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 166 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 168 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 167 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -76498,7 +78493,7 @@ var ts;
                 },
                 getDeclarationStatementsForSourceFile: function (node, flags, tracker, bundled) {
                     var n = ts.getParseTreeNode(node);
-                    ts.Debug.assert(n && n.kind === 294 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile");
+                    ts.Debug.assert(n && n.kind === 297 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile");
                     var sym = getSymbolOfNode(node);
                     if (!sym) {
                         return !node.locals ? [] : nodeBuilder.symbolTableToDeclarationStatements(node.locals, node, flags, tracker, bundled);
@@ -76533,7 +78528,7 @@ var ts;
                 return false;
             }
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 220 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 283 /* HeritageClause */;
+                return node.parent && node.parent.kind === 223 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 286 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -76545,7 +78540,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 = 788968 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 78 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 198 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 78 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 201 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -76596,7 +78591,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 294 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 297 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -76624,12 +78619,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 253 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 256 /* 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, 294 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 297 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -76823,14 +78818,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 164 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 165 /* 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 === 166 /* GetAccessor */ || node.kind === 167 /* SetAccessor */) {
+            else if (node.kind === 167 /* GetAccessor */ || node.kind === 168 /* 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);
@@ -76847,17 +78842,17 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 141 /* ReadonlyKeyword */) {
-                    if (node.kind === 161 /* PropertySignature */ || node.kind === 163 /* MethodSignature */) {
+                if (modifier.kind !== 142 /* ReadonlyKeyword */) {
+                    if (node.kind === 162 /* PropertySignature */ || node.kind === 164 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 170 /* IndexSignature */) {
+                    if (node.kind === 171 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 84 /* ConstKeyword */:
-                        if (node.kind !== 252 /* EnumDeclaration */) {
+                        if (node.kind !== 255 /* EnumDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(84 /* ConstKeyword */));
                         }
                         break;
@@ -76877,7 +78872,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 === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) {
+                        else if (node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -76903,10 +78898,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 === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) {
+                        else if (node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 159 /* Parameter */) {
+                        else if (node.kind === 160 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -76918,11 +78913,11 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 141 /* ReadonlyKeyword */:
+                    case 142 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 162 /* PropertyDeclaration */ && node.kind !== 161 /* PropertySignature */ && node.kind !== 170 /* IndexSignature */ && node.kind !== 159 /* Parameter */) {
+                        else if (node.kind !== 163 /* PropertyDeclaration */ && node.kind !== 162 /* PropertySignature */ && node.kind !== 171 /* IndexSignature */ && node.kind !== 160 /* 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);
                         }
@@ -76943,16 +78938,16 @@ var ts;
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (ts.isClassLike(node.parent)) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "export");
                         }
-                        else if (node.kind === 159 /* Parameter */) {
+                        else if (node.kind === 160 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
                     case 87 /* DefaultKeyword */:
-                        var container = node.parent.kind === 294 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 253 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                        var container = node.parent.kind === 297 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 256 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
@@ -76965,12 +78960,12 @@ var ts;
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (ts.isClassLike(node.parent) && !ts.isPropertyDeclaration(node)) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "declare");
                         }
-                        else if (node.kind === 159 /* Parameter */) {
+                        else if (node.kind === 160 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 254 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 257 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         else if (ts.isPrivateIdentifierPropertyDeclaration(node)) {
@@ -76983,14 +78978,14 @@ var ts;
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 249 /* ClassDeclaration */) {
-                            if (node.kind !== 164 /* MethodDeclaration */ &&
-                                node.kind !== 162 /* PropertyDeclaration */ &&
-                                node.kind !== 166 /* GetAccessor */ &&
-                                node.kind !== 167 /* SetAccessor */) {
+                        if (node.kind !== 252 /* ClassDeclaration */) {
+                            if (node.kind !== 165 /* MethodDeclaration */ &&
+                                node.kind !== 163 /* PropertyDeclaration */ &&
+                                node.kind !== 167 /* GetAccessor */ &&
+                                node.kind !== 168 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 249 /* ClassDeclaration */ && ts.hasSyntacticModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 252 /* ClassDeclaration */ && ts.hasSyntacticModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -76999,6 +78994,9 @@ var ts;
                             if (flags & 8 /* Private */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
+                            if (flags & 256 /* Async */ && lastAsync) {
+                                return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "async", "abstract");
+                            }
                         }
                         if (ts.isNamedDeclaration(node) && node.name.kind === 79 /* PrivateIdentifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");
@@ -77012,15 +79010,18 @@ var ts;
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 8388608 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 159 /* Parameter */) {
+                        else if (node.kind === 160 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
+                        if (flags & 128 /* Abstract */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "async", "abstract");
+                        }
                         flags |= 256 /* Async */;
                         lastAsync = modifier;
                         break;
                 }
             }
-            if (node.kind === 165 /* Constructor */) {
+            if (node.kind === 166 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -77035,13 +79036,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 258 /* ImportDeclaration */ || node.kind === 257 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 261 /* ImportDeclaration */ || node.kind === 260 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 159 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 160 /* 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 === 159 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 160 /* 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 */) {
@@ -77062,37 +79063,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 165 /* Constructor */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 170 /* IndexSignature */:
-                case 253 /* ModuleDeclaration */:
-                case 258 /* ImportDeclaration */:
-                case 257 /* ImportEqualsDeclaration */:
-                case 264 /* ExportDeclaration */:
-                case 263 /* ExportAssignment */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 159 /* Parameter */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 166 /* Constructor */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 171 /* IndexSignature */:
+                case 256 /* ModuleDeclaration */:
+                case 261 /* ImportDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 267 /* ExportDeclaration */:
+                case 266 /* ExportAssignment */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 160 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) {
+                    if (node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 248 /* FunctionDeclaration */:
+                        case 251 /* FunctionDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 129 /* AsyncKeyword */);
-                        case 249 /* ClassDeclaration */:
+                        case 252 /* ClassDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 125 /* AbstractKeyword */);
-                        case 250 /* InterfaceDeclaration */:
-                        case 229 /* VariableStatement */:
-                        case 251 /* TypeAliasDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
+                        case 232 /* VariableStatement */:
+                        case 254 /* TypeAliasDeclaration */:
                             return true;
-                        case 252 /* EnumDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 84 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
@@ -77105,10 +79106,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 164 /* MethodDeclaration */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 165 /* MethodDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -77227,7 +79228,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 146 /* StringKeyword */ && parameter.type.kind !== 143 /* NumberKeyword */) {
+            if (parameter.type.kind !== 147 /* StringKeyword */ && parameter.type.kind !== 144 /* 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(node.type ? getTypeFromTypeNode(node.type) : anyType));
@@ -77269,7 +79270,7 @@ var ts;
             if (args) {
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 219 /* OmittedExpression */) {
+                    if (arg.kind === 222 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -77346,20 +79347,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 157 /* ComputedPropertyName */) {
+            if (node.kind !== 158 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 213 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 216 /* 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 === 248 /* FunctionDeclaration */ ||
-                    node.kind === 205 /* FunctionExpression */ ||
-                    node.kind === 164 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 251 /* FunctionDeclaration */ ||
+                    node.kind === 208 /* FunctionExpression */ ||
+                    node.kind === 165 /* MethodDeclaration */);
                 if (node.flags & 8388608 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -77378,7 +79379,7 @@ var ts;
             var seen = new ts.Map();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 287 /* SpreadAssignment */) {
+                if (prop.kind === 290 /* SpreadAssignment */) {
                     if (inDestructuring) {
                         // a rest property cannot be destructured any further
                         var expression = ts.skipParentheses(prop.expression);
@@ -77389,11 +79390,11 @@ var ts;
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 157 /* ComputedPropertyName */) {
+                if (name.kind === 158 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 286 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 289 /* 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.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
@@ -77406,7 +79407,7 @@ var ts;
                     // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 129 /* AsyncKeyword */ || prop.kind !== 164 /* MethodDeclaration */) {
+                        if (mod.kind !== 129 /* AsyncKeyword */ || prop.kind !== 165 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -77421,10 +79422,10 @@ 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 286 /* ShorthandPropertyAssignment */:
+                    case 289 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     // falls through
-                    case 285 /* PropertyAssignment */:
+                    case 288 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
@@ -77432,13 +79433,13 @@ var ts;
                         }
                         currentKind = 4 /* PropertyAssignment */;
                         break;
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         currentKind = 8 /* Method */;
                         break;
-                    case 166 /* GetAccessor */:
+                    case 167 /* GetAccessor */:
                         currentKind = 1 /* GetAccessor */;
                         break;
-                    case 167 /* SetAccessor */:
+                    case 168 /* SetAccessor */:
                         currentKind = 2 /* SetAccessor */;
                         break;
                     default:
@@ -77477,7 +79478,7 @@ var ts;
             var seen = new ts.Map();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 279 /* JsxSpreadAttribute */) {
+                if (attr.kind === 282 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -77487,7 +79488,7 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 280 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 283 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -77501,14 +79502,14 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 236 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 239 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 32768 /* AwaitContext */) === 0 /* None */) {
                     // 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 !== 165 /* Constructor */) {
+                        if (func && func.kind !== 166 /* 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);
@@ -77519,7 +79520,7 @@ var ts;
                     return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 247 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 250 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -77534,20 +79535,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 235 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 238 /* 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 === 235 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 238 /* 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 === 235 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 238 /* 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);
@@ -77572,11 +79573,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, accessor.kind === 166 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, accessor.kind === 167 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            if (accessor.kind === 167 /* SetAccessor */) {
+            if (accessor.kind === 168 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -77598,17 +79599,17 @@ 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 === 166 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 167 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 166 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 167 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 150 /* UniqueKeyword */) {
-                if (node.type.kind !== 147 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(147 /* SymbolKeyword */));
+            if (node.operator === 151 /* UniqueKeyword */) {
+                if (node.type.kind !== 148 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(148 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 if (ts.isInJSFile(parent) && ts.isJSDocTypeExpression(parent)) {
@@ -77619,7 +79620,7 @@ var ts;
                     }
                 }
                 switch (parent.kind) {
-                    case 246 /* VariableDeclaration */:
+                    case 249 /* VariableDeclaration */:
                         var decl = parent;
                         if (decl.name.kind !== 78 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
@@ -77631,13 +79632,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         if (!ts.hasSyntacticModifier(parent, 32 /* Static */) ||
                             !ts.hasEffectiveModifier(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 161 /* PropertySignature */:
+                    case 162 /* PropertySignature */:
                         if (!ts.hasSyntacticModifier(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);
                         }
@@ -77646,9 +79647,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 141 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 177 /* ArrayType */ && node.type.kind !== 178 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(147 /* SymbolKeyword */));
+            else if (node.operator === 142 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 178 /* ArrayType */ && node.type.kind !== 179 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(148 /* SymbolKeyword */));
                 }
             }
         }
@@ -77661,8 +79662,8 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 164 /* MethodDeclaration */) {
-                if (node.parent.kind === 197 /* ObjectLiteralExpression */) {
+            if (node.kind === 165 /* MethodDeclaration */) {
+                if (node.parent.kind === 200 /* 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 === 129 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -77690,14 +79691,14 @@ var ts;
                 if (node.flags & 8388608 /* 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 === 164 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 165 /* 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 === 250 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 253 /* 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 === 176 /* TypeLiteral */) {
+            else if (node.parent.kind === 177 /* 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);
             }
         }
@@ -77708,11 +79709,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 242 /* LabeledStatement */:
+                    case 245 /* 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 === 237 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 240 /* 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);
@@ -77720,8 +79721,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 241 /* SwitchStatement */:
-                        if (node.kind === 238 /* BreakStatement */ && !node.label) {
+                    case 244 /* SwitchStatement */:
+                        if (node.kind === 241 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -77736,13 +79737,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 238 /* BreakStatement */
+                var message = node.kind === 241 /* 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 === 238 /* BreakStatement */
+                var message = node.kind === 241 /* 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);
@@ -77766,12 +79767,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return ts.isStringOrNumericLiteralLike(expr) ||
-                expr.kind === 211 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
+                expr.kind === 214 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 211 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
+                expr.kind === 214 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -77802,7 +79803,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 235 /* ForInStatement */ && node.parent.parent.kind !== 236 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 238 /* ForInStatement */ && node.parent.parent.kind !== 239 /* ForOfStatement */) {
                 if (node.flags & 8388608 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -77815,8 +79816,11 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 229 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
+            if (node.exclamationToken && (node.parent.parent.kind !== 232 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) {
+                var message = node.initializer
+                    ? ts.Diagnostics.Declarations_with_initializers_cannot_also_have_definite_assignment_assertions
+                    : ts.Diagnostics.Declarations_with_definite_assignment_assertions_must_also_have_type_annotations;
+                return grammarErrorOnNode(node.exclamationToken, message);
             }
             var moduleKind = ts.getEmitModuleKind(compilerOptions);
             if (moduleKind < ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.System &&
@@ -77878,15 +79882,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 231 /* IfStatement */:
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
-                case 240 /* WithStatement */:
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
+                case 234 /* IfStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
+                case 243 /* WithStatement */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
                     return false;
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -77978,7 +79982,7 @@ var ts;
                     return grammarErrorOnNode(node.name, ts.Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
                 }
             }
-            else if (node.parent.kind === 250 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 253 /* 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;
                 }
@@ -77986,7 +79990,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 176 /* TypeLiteral */) {
+            else if (node.parent.kind === 177 /* 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;
                 }
@@ -77999,7 +80003,12 @@ var ts;
             }
             if (ts.isPropertyDeclaration(node) && node.exclamationToken && (!ts.isClassLike(node.parent) || !node.type || node.initializer ||
                 node.flags & 8388608 /* Ambient */ || ts.hasSyntacticModifier(node, 32 /* Static */ | 128 /* Abstract */))) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+                var message = node.initializer
+                    ? ts.Diagnostics.Declarations_with_initializers_cannot_also_have_definite_assignment_assertions
+                    : !node.type
+                        ? ts.Diagnostics.Declarations_with_definite_assignment_assertions_must_also_have_type_annotations
+                        : ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context;
+                return grammarErrorOnNode(node.exclamationToken, message);
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
@@ -78015,13 +80024,13 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 250 /* InterfaceDeclaration */ ||
-                node.kind === 251 /* TypeAliasDeclaration */ ||
-                node.kind === 258 /* ImportDeclaration */ ||
-                node.kind === 257 /* ImportEqualsDeclaration */ ||
-                node.kind === 264 /* ExportDeclaration */ ||
-                node.kind === 263 /* ExportAssignment */ ||
-                node.kind === 256 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 253 /* InterfaceDeclaration */ ||
+                node.kind === 254 /* TypeAliasDeclaration */ ||
+                node.kind === 261 /* ImportDeclaration */ ||
+                node.kind === 260 /* ImportEqualsDeclaration */ ||
+                node.kind === 267 /* ExportDeclaration */ ||
+                node.kind === 266 /* ExportAssignment */ ||
+                node.kind === 259 /* NamespaceExportDeclaration */ ||
                 ts.hasSyntacticModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
@@ -78030,7 +80039,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 229 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 232 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -78053,7 +80062,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 === 227 /* Block */ || node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) {
+                if (node.parent.kind === 230 /* Block */ || node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
                     var links_2 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_2.hasReportedStatementInAmbientContext) {
@@ -78075,10 +80084,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, 190 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 191 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 288 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 291 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -78253,14 +80262,14 @@ var ts;
         return !ts.isAccessor(declaration);
     }
     function isNotOverload(declaration) {
-        return (declaration.kind !== 248 /* FunctionDeclaration */ && declaration.kind !== 164 /* MethodDeclaration */) ||
+        return (declaration.kind !== 251 /* FunctionDeclaration */ && declaration.kind !== 165 /* MethodDeclaration */) ||
             !!declaration.body;
     }
     /** 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 262 /* ImportSpecifier */:
-            case 267 /* ExportSpecifier */:
+            case 265 /* ImportSpecifier */:
+            case 270 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -78268,14 +80277,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 259 /* ImportClause */: // For default import
-            case 257 /* ImportEqualsDeclaration */:
-            case 260 /* NamespaceImport */:
-            case 262 /* ImportSpecifier */: // For rename import `x as y`
+            case 262 /* ImportClause */: // For default import
+            case 260 /* ImportEqualsDeclaration */:
+            case 263 /* NamespaceImport */:
+            case 265 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
             case 78 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 262 /* ImportSpecifier */;
+                return decl.parent.kind === 265 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -78507,7 +80516,7 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 155 /* LastToken */) || kind === 186 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 156 /* LastToken */) || kind === 187 /* ThisType */) {
             return node;
         }
         var factory = context.factory;
@@ -78515,287 +80524,291 @@ var ts;
             // Names
             case 78 /* Identifier */:
                 return factory.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 156 /* QualifiedName */:
+            case 157 /* QualifiedName */:
                 return factory.updateQualifiedName(node, nodeVisitor(node.left, visitor, ts.isEntityName), nodeVisitor(node.right, visitor, ts.isIdentifier));
-            case 157 /* ComputedPropertyName */:
+            case 158 /* ComputedPropertyName */:
                 return factory.updateComputedPropertyName(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 158 /* TypeParameter */:
+            case 159 /* TypeParameter */:
                 return factory.updateTypeParameterDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.constraint, visitor, ts.isTypeNode), nodeVisitor(node.default, visitor, ts.isTypeNode));
-            case 159 /* Parameter */:
+            case 160 /* Parameter */:
                 return factory.updateParameterDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
-            case 160 /* Decorator */:
+            case 161 /* Decorator */:
                 return factory.updateDecorator(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 161 /* PropertySignature */:
+            case 162 /* PropertySignature */:
                 return factory.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 162 /* PropertyDeclaration */:
+            case 163 /* PropertyDeclaration */:
                 return factory.updatePropertyDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), 
                 // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
                 nodeVisitor(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
-            case 163 /* MethodSignature */:
+            case 164 /* MethodSignature */:
                 return factory.updateMethodSignature(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 164 /* MethodDeclaration */:
+            case 165 /* MethodDeclaration */:
                 return factory.updateMethodDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 165 /* Constructor */:
+            case 166 /* Constructor */:
                 return factory.updateConstructorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 166 /* GetAccessor */:
+            case 167 /* GetAccessor */:
                 return factory.updateGetAccessorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 167 /* SetAccessor */:
+            case 168 /* SetAccessor */:
                 return factory.updateSetAccessorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 168 /* CallSignature */:
+            case 169 /* CallSignature */:
                 return factory.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 169 /* ConstructSignature */:
+            case 170 /* ConstructSignature */:
                 return factory.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 170 /* IndexSignature */:
+            case 171 /* IndexSignature */:
                 return factory.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
             // Types
-            case 171 /* TypePredicate */:
+            case 172 /* TypePredicate */:
                 return factory.updateTypePredicateNode(node, nodeVisitor(node.assertsModifier, visitor), nodeVisitor(node.parameterName, visitor), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 172 /* TypeReference */:
+            case 173 /* TypeReference */:
                 return factory.updateTypeReferenceNode(node, nodeVisitor(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 173 /* FunctionType */:
+            case 174 /* FunctionType */:
                 return factory.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 174 /* ConstructorType */:
+            case 175 /* ConstructorType */:
                 return factory.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 175 /* TypeQuery */:
+            case 176 /* TypeQuery */:
                 return factory.updateTypeQueryNode(node, nodeVisitor(node.exprName, visitor, ts.isEntityName));
-            case 176 /* TypeLiteral */:
+            case 177 /* TypeLiteral */:
                 return factory.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 177 /* ArrayType */:
+            case 178 /* ArrayType */:
                 return factory.updateArrayTypeNode(node, nodeVisitor(node.elementType, visitor, ts.isTypeNode));
-            case 178 /* TupleType */:
+            case 179 /* TupleType */:
                 return factory.updateTupleTypeNode(node, nodesVisitor(node.elements, visitor, ts.isTypeNode));
-            case 179 /* OptionalType */:
+            case 180 /* OptionalType */:
                 return factory.updateOptionalTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 180 /* RestType */:
+            case 181 /* RestType */:
                 return factory.updateRestTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 181 /* UnionType */:
+            case 182 /* UnionType */:
                 return factory.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 182 /* IntersectionType */:
+            case 183 /* IntersectionType */:
                 return factory.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 183 /* ConditionalType */:
+            case 184 /* ConditionalType */:
                 return factory.updateConditionalTypeNode(node, nodeVisitor(node.checkType, visitor, ts.isTypeNode), nodeVisitor(node.extendsType, visitor, ts.isTypeNode), nodeVisitor(node.trueType, visitor, ts.isTypeNode), nodeVisitor(node.falseType, visitor, ts.isTypeNode));
-            case 184 /* InferType */:
+            case 185 /* InferType */:
                 return factory.updateInferTypeNode(node, nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 192 /* ImportType */:
+            case 195 /* ImportType */:
                 return factory.updateImportTypeNode(node, nodeVisitor(node.argument, visitor, ts.isTypeNode), nodeVisitor(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 191 /* NamedTupleMember */:
+            case 192 /* NamedTupleMember */:
                 return factory.updateNamedTupleMember(node, visitNode(node.dotDotDotToken, visitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 185 /* ParenthesizedType */:
+            case 186 /* ParenthesizedType */:
                 return factory.updateParenthesizedType(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 187 /* TypeOperator */:
+            case 188 /* TypeOperator */:
                 return factory.updateTypeOperatorNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 188 /* IndexedAccessType */:
+            case 189 /* IndexedAccessType */:
                 return factory.updateIndexedAccessTypeNode(node, nodeVisitor(node.objectType, visitor, ts.isTypeNode), nodeVisitor(node.indexType, visitor, ts.isTypeNode));
-            case 189 /* MappedType */:
-                return factory.updateMappedTypeNode(node, nodeVisitor(node.readonlyToken, tokenVisitor, ts.isToken), nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 190 /* LiteralType */:
+            case 190 /* MappedType */:
+                return factory.updateMappedTypeNode(node, nodeVisitor(node.readonlyToken, tokenVisitor, ts.isToken), nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.nameType, visitor, ts.isTypeNode), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode));
+            case 191 /* LiteralType */:
                 return factory.updateLiteralTypeNode(node, nodeVisitor(node.literal, visitor, ts.isExpression));
+            case 193 /* TemplateLiteralType */:
+                return factory.updateTemplateLiteralType(node, nodeVisitor(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateLiteralTypeSpan));
+            case 194 /* TemplateLiteralTypeSpan */:
+                return factory.updateTemplateLiteralTypeSpan(node, nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Binding patterns
-            case 193 /* ObjectBindingPattern */:
+            case 196 /* ObjectBindingPattern */:
                 return factory.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 194 /* ArrayBindingPattern */:
+            case 197 /* ArrayBindingPattern */:
                 return factory.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 195 /* BindingElement */:
+            case 198 /* BindingElement */:
                 return factory.updateBindingElement(node, nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.propertyName, visitor, ts.isPropertyName), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 196 /* ArrayLiteralExpression */:
+            case 199 /* ArrayLiteralExpression */:
                 return factory.updateArrayLiteralExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 197 /* ObjectLiteralExpression */:
+            case 200 /* ObjectLiteralExpression */:
                 return factory.updateObjectLiteralExpression(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 198 /* PropertyAccessExpression */:
+            case 201 /* PropertyAccessExpression */:
                 if (node.flags & 32 /* OptionalChain */) {
                     return factory.updatePropertyAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier));
                 }
                 return factory.updatePropertyAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.name, visitor, ts.isIdentifierOrPrivateIdentifier));
-            case 199 /* ElementAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 if (node.flags & 32 /* OptionalChain */) {
                     return factory.updateElementAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.argumentExpression, visitor, ts.isExpression));
                 }
                 return factory.updateElementAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.argumentExpression, visitor, ts.isExpression));
-            case 200 /* CallExpression */:
+            case 203 /* CallExpression */:
                 if (node.flags & 32 /* OptionalChain */) {
                     return factory.updateCallChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
                 }
                 return factory.updateCallExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 201 /* NewExpression */:
+            case 204 /* NewExpression */:
                 return factory.updateNewExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 202 /* TaggedTemplateExpression */:
+            case 205 /* TaggedTemplateExpression */:
                 return factory.updateTaggedTemplateExpression(node, nodeVisitor(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), nodeVisitor(node.template, visitor, ts.isTemplateLiteral));
-            case 203 /* TypeAssertionExpression */:
+            case 206 /* TypeAssertionExpression */:
                 return factory.updateTypeAssertion(node, nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 204 /* ParenthesizedExpression */:
+            case 207 /* ParenthesizedExpression */:
                 return factory.updateParenthesizedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 205 /* FunctionExpression */:
+            case 208 /* FunctionExpression */:
                 return factory.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 206 /* ArrowFunction */:
+            case 209 /* ArrowFunction */:
                 return factory.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.equalsGreaterThanToken, tokenVisitor, ts.isToken), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 207 /* DeleteExpression */:
+            case 210 /* DeleteExpression */:
                 return factory.updateDeleteExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 208 /* TypeOfExpression */:
+            case 211 /* TypeOfExpression */:
                 return factory.updateTypeOfExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 209 /* VoidExpression */:
+            case 212 /* VoidExpression */:
                 return factory.updateVoidExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 210 /* AwaitExpression */:
+            case 213 /* AwaitExpression */:
                 return factory.updateAwaitExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 211 /* PrefixUnaryExpression */:
+            case 214 /* PrefixUnaryExpression */:
                 return factory.updatePrefixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression));
-            case 212 /* PostfixUnaryExpression */:
+            case 215 /* PostfixUnaryExpression */:
                 return factory.updatePostfixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression));
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 return factory.updateBinaryExpression(node, nodeVisitor(node.left, visitor, ts.isExpression), nodeVisitor(node.operatorToken, tokenVisitor, ts.isToken), nodeVisitor(node.right, visitor, ts.isExpression));
-            case 214 /* ConditionalExpression */:
+            case 217 /* ConditionalExpression */:
                 return factory.updateConditionalExpression(node, nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.whenTrue, visitor, ts.isExpression), nodeVisitor(node.colonToken, tokenVisitor, ts.isToken), nodeVisitor(node.whenFalse, visitor, ts.isExpression));
-            case 215 /* TemplateExpression */:
+            case 218 /* TemplateExpression */:
                 return factory.updateTemplateExpression(node, nodeVisitor(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 216 /* YieldExpression */:
+            case 219 /* YieldExpression */:
                 return factory.updateYieldExpression(node, nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 217 /* SpreadElement */:
+            case 220 /* SpreadElement */:
                 return factory.updateSpreadElement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 218 /* ClassExpression */:
+            case 221 /* ClassExpression */:
                 return factory.updateClassExpression(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 220 /* ExpressionWithTypeArguments */:
+            case 223 /* ExpressionWithTypeArguments */:
                 return factory.updateExpressionWithTypeArguments(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 221 /* AsExpression */:
+            case 224 /* AsExpression */:
                 return factory.updateAsExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 222 /* NonNullExpression */:
+            case 225 /* NonNullExpression */:
                 if (node.flags & 32 /* OptionalChain */) {
                     return factory.updateNonNullChain(node, nodeVisitor(node.expression, visitor, ts.isExpression));
                 }
                 return factory.updateNonNullExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 223 /* MetaProperty */:
+            case 226 /* MetaProperty */:
                 return factory.updateMetaProperty(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 225 /* TemplateSpan */:
+            case 228 /* TemplateSpan */:
                 return factory.updateTemplateSpan(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 227 /* Block */:
+            case 230 /* Block */:
                 return factory.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 229 /* VariableStatement */:
+            case 232 /* VariableStatement */:
                 return factory.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 230 /* ExpressionStatement */:
+            case 233 /* ExpressionStatement */:
                 return factory.updateExpressionStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 231 /* IfStatement */:
+            case 234 /* IfStatement */:
                 return factory.updateIfStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.thenStatement, visitor, ts.isStatement, factory.liftToBlock), nodeVisitor(node.elseStatement, visitor, ts.isStatement, factory.liftToBlock));
-            case 232 /* DoStatement */:
+            case 235 /* DoStatement */:
                 return factory.updateDoStatement(node, nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 233 /* WhileStatement */:
+            case 236 /* WhileStatement */:
                 return factory.updateWhileStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 234 /* ForStatement */:
+            case 237 /* ForStatement */:
                 return factory.updateForStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.incrementor, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 235 /* ForInStatement */:
+            case 238 /* ForInStatement */:
                 return factory.updateForInStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 236 /* ForOfStatement */:
+            case 239 /* ForOfStatement */:
                 return factory.updateForOfStatement(node, nodeVisitor(node.awaitModifier, tokenVisitor, ts.isToken), nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 237 /* ContinueStatement */:
+            case 240 /* ContinueStatement */:
                 return factory.updateContinueStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier));
-            case 238 /* BreakStatement */:
+            case 241 /* BreakStatement */:
                 return factory.updateBreakStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier));
-            case 239 /* ReturnStatement */:
+            case 242 /* ReturnStatement */:
                 return factory.updateReturnStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 240 /* WithStatement */:
+            case 243 /* WithStatement */:
                 return factory.updateWithStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 241 /* SwitchStatement */:
+            case 244 /* SwitchStatement */:
                 return factory.updateSwitchStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.caseBlock, visitor, ts.isCaseBlock));
-            case 242 /* LabeledStatement */:
+            case 245 /* LabeledStatement */:
                 return factory.updateLabeledStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 243 /* ThrowStatement */:
+            case 246 /* ThrowStatement */:
                 return factory.updateThrowStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 244 /* TryStatement */:
+            case 247 /* TryStatement */:
                 return factory.updateTryStatement(node, nodeVisitor(node.tryBlock, visitor, ts.isBlock), nodeVisitor(node.catchClause, visitor, ts.isCatchClause), nodeVisitor(node.finallyBlock, visitor, ts.isBlock));
-            case 246 /* VariableDeclaration */:
+            case 249 /* VariableDeclaration */:
                 return factory.updateVariableDeclaration(node, nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.exclamationToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
-            case 247 /* VariableDeclarationList */:
+            case 250 /* VariableDeclarationList */:
                 return factory.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 248 /* FunctionDeclaration */:
+            case 251 /* FunctionDeclaration */:
                 return factory.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor));
-            case 249 /* ClassDeclaration */:
+            case 252 /* ClassDeclaration */:
                 return factory.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 250 /* InterfaceDeclaration */:
+            case 253 /* InterfaceDeclaration */:
                 return factory.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 251 /* TypeAliasDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
                 return factory.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 252 /* EnumDeclaration */:
+            case 255 /* EnumDeclaration */:
                 return factory.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return factory.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.body, visitor, ts.isModuleBody));
-            case 254 /* ModuleBlock */:
+            case 257 /* ModuleBlock */:
                 return factory.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 255 /* CaseBlock */:
+            case 258 /* CaseBlock */:
                 return factory.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 256 /* NamespaceExportDeclaration */:
+            case 259 /* NamespaceExportDeclaration */:
                 return factory.updateNamespaceExportDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 257 /* ImportEqualsDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 return factory.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.moduleReference, visitor, ts.isModuleReference));
-            case 258 /* ImportDeclaration */:
+            case 261 /* ImportDeclaration */:
                 return factory.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.importClause, visitor, ts.isImportClause), nodeVisitor(node.moduleSpecifier, visitor, ts.isExpression));
-            case 259 /* ImportClause */:
+            case 262 /* ImportClause */:
                 return factory.updateImportClause(node, node.isTypeOnly, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 260 /* NamespaceImport */:
+            case 263 /* NamespaceImport */:
                 return factory.updateNamespaceImport(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 266 /* NamespaceExport */:
+            case 269 /* NamespaceExport */:
                 return factory.updateNamespaceExport(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 261 /* NamedImports */:
+            case 264 /* NamedImports */:
                 return factory.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 262 /* ImportSpecifier */:
+            case 265 /* ImportSpecifier */:
                 return factory.updateImportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 263 /* ExportAssignment */:
+            case 266 /* ExportAssignment */:
                 return factory.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 264 /* ExportDeclaration */:
+            case 267 /* ExportDeclaration */:
                 return factory.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), node.isTypeOnly, nodeVisitor(node.exportClause, visitor, ts.isNamedExportBindings), nodeVisitor(node.moduleSpecifier, visitor, ts.isExpression));
-            case 265 /* NamedExports */:
+            case 268 /* NamedExports */:
                 return factory.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 267 /* ExportSpecifier */:
+            case 270 /* ExportSpecifier */:
                 return factory.updateExportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 269 /* ExternalModuleReference */:
+            case 272 /* ExternalModuleReference */:
                 return factory.updateExternalModuleReference(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // JSX
-            case 270 /* JsxElement */:
+            case 273 /* JsxElement */:
                 return factory.updateJsxElement(node, nodeVisitor(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 271 /* JsxSelfClosingElement */:
+            case 274 /* JsxSelfClosingElement */:
                 return factory.updateJsxSelfClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes));
-            case 272 /* JsxOpeningElement */:
+            case 275 /* JsxOpeningElement */:
                 return factory.updateJsxOpeningElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes));
-            case 273 /* JsxClosingElement */:
+            case 276 /* JsxClosingElement */:
                 return factory.updateJsxClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 274 /* JsxFragment */:
+            case 277 /* JsxFragment */:
                 return factory.updateJsxFragment(node, nodeVisitor(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 277 /* JsxAttribute */:
+            case 280 /* JsxAttribute */:
                 return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 278 /* JsxAttributes */:
+            case 281 /* JsxAttributes */:
                 return factory.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 279 /* JsxSpreadAttribute */:
+            case 282 /* JsxSpreadAttribute */:
                 return factory.updateJsxSpreadAttribute(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 280 /* JsxExpression */:
+            case 283 /* JsxExpression */:
                 return factory.updateJsxExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 281 /* CaseClause */:
+            case 284 /* CaseClause */:
                 return factory.updateCaseClause(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 282 /* DefaultClause */:
+            case 285 /* DefaultClause */:
                 return factory.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 283 /* HeritageClause */:
+            case 286 /* HeritageClause */:
                 return factory.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 284 /* CatchClause */:
+            case 287 /* CatchClause */:
                 return factory.updateCatchClause(node, nodeVisitor(node.variableDeclaration, visitor, ts.isVariableDeclaration), nodeVisitor(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 285 /* PropertyAssignment */:
+            case 288 /* PropertyAssignment */:
                 return factory.updatePropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
-            case 286 /* ShorthandPropertyAssignment */:
+            case 289 /* ShorthandPropertyAssignment */:
                 return factory.updateShorthandPropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 287 /* SpreadAssignment */:
+            case 290 /* SpreadAssignment */:
                 return factory.updateSpreadAssignment(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Enum
-            case 288 /* EnumMember */:
+            case 291 /* EnumMember */:
                 return factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 294 /* SourceFile */:
+            case 297 /* SourceFile */:
                 return factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 331 /* PartiallyEmittedExpression */:
+            case 336 /* PartiallyEmittedExpression */:
                 return factory.updatePartiallyEmittedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 332 /* CommaListExpression */:
+            case 337 /* CommaListExpression */:
                 return factory.updateCommaListExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -79470,7 +81483,7 @@ var ts;
     function chainBundle(context, transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 294 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 297 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return context.factory.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -79521,7 +81534,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -79534,13 +81547,13 @@ var ts;
                         hasImportDefault = true;
                     }
                     break;
-                case 257 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 269 /* ExternalModuleReference */) {
+                case 260 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 272 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -79571,13 +81584,13 @@ var ts;
                         addExportedNamesForExportDeclaration(node);
                     }
                     break;
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         for (var _b = 0, _c = node.declarationList.declarations; _b < _c.length; _b++) {
                             var decl = _c[_b];
@@ -79585,7 +81598,7 @@ var ts;
                         }
                     }
                     break;
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         if (ts.hasSyntacticModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -79605,7 +81618,7 @@ var ts;
                         }
                     }
                     break;
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         if (ts.hasSyntacticModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -79779,7 +81792,7 @@ var ts;
      * @param isStatic A value indicating whether the member should be a static or instance member.
      */
     function isInitializedProperty(member) {
-        return member.kind === 162 /* PropertyDeclaration */
+        return member.kind === 163 /* PropertyDeclaration */
             && member.initializer !== undefined;
     }
     ts.isInitializedProperty = isInitializedProperty;
@@ -79998,18 +82011,27 @@ var ts;
      * for the element.
      */
     function flattenBindingOrAssignmentElement(flattenContext, element, value, location, skipInitializer) {
+        var bindingTarget = ts.getTargetOfBindingOrAssignmentElement(element); // TODO: GH#18217
         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;
+                if (value) {
+                    value = createDefaultValueCheck(flattenContext, value, initializer, location);
+                    // If 'value' is not a simple expression, it could contain side-effecting code that should evaluate before an object or array binding pattern.
+                    if (!ts.isSimpleInlineableExpression(initializer) && ts.isBindingOrAssignmentPattern(bindingTarget)) {
+                        value = ensureIdentifier(flattenContext, value, /*reuseIdentifierExpressions*/ true, location);
+                    }
+                }
+                else {
+                    value = initializer;
+                }
             }
             else if (!value) {
                 // Use 'void 0' in absence of value and initializer
                 value = flattenContext.context.factory.createVoidZero();
             }
         }
-        var bindingTarget = ts.getTargetOfBindingOrAssignmentElement(element); // TODO: GH#18217
         if (ts.isObjectBindingOrAssignmentPattern(bindingTarget)) {
             flattenObjectBindingOrAssignmentPattern(flattenContext, element, bindingTarget, value, location);
         }
@@ -80114,7 +82136,8 @@ 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 & 16384 /* ContainsObjectRestOrSpread */) {
+                if (element.transformFlags & 16384 /* ContainsObjectRestOrSpread */ || flattenContext.hasTransformedPriorElement && !isSimpleBindingOrAssignmentElement(element)) {
+                    flattenContext.hasTransformedPriorElement = true;
                     var temp = flattenContext.context.factory.createTempVariable(/*recordTempVariable*/ undefined);
                     if (flattenContext.hoistTempVariables) {
                         flattenContext.context.hoistVariableDeclaration(temp);
@@ -80148,6 +82171,20 @@ var ts;
             }
         }
     }
+    function isSimpleBindingOrAssignmentElement(element) {
+        var target = ts.getTargetOfBindingOrAssignmentElement(element);
+        if (!target || ts.isOmittedExpression(target))
+            return true;
+        var propertyName = ts.tryGetPropertyNameOfBindingOrAssignmentElement(element);
+        if (propertyName && !ts.isPropertyNameLiteral(propertyName))
+            return false;
+        var initializer = ts.getInitializerOfBindingOrAssignmentElement(element);
+        if (initializer && !ts.isSimpleInlineableExpression(initializer))
+            return false;
+        if (ts.isBindingOrAssignmentPattern(target))
+            return ts.every(ts.getElementsOfBindingOrAssignmentPattern(target), isSimpleBindingOrAssignmentElement);
+        return ts.isIdentifier(target);
+    }
     /**
      * Creates an expression used to provide a default value if a value is `undefined` at runtime.
      *
@@ -80357,8 +82394,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(198 /* PropertyAccessExpression */);
-        context.enableSubstitution(199 /* ElementAccessExpression */);
+        context.enableSubstitution(201 /* PropertyAccessExpression */);
+        context.enableSubstitution(202 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -80384,14 +82421,14 @@ var ts;
         var applicableSubstitutions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 295 /* Bundle */) {
+            if (node.kind === 298 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return factory.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 297 /* InputFiles */) {
+                if (prepend.kind === 300 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -80442,16 +82479,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 294 /* SourceFile */:
-                case 255 /* CaseBlock */:
-                case 254 /* ModuleBlock */:
-                case 227 /* Block */:
+                case 297 /* SourceFile */:
+                case 258 /* CaseBlock */:
+                case 257 /* ModuleBlock */:
+                case 230 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 249 /* ClassDeclaration */:
-                case 248 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     if (ts.hasSyntacticModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -80463,7 +82500,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 === 249 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 252 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -80506,10 +82543,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
-                case 257 /* ImportEqualsDeclaration */:
-                case 263 /* ExportAssignment */:
-                case 264 /* ExportDeclaration */:
+                case 261 /* ImportDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 266 /* ExportAssignment */:
+                case 267 /* ExportDeclaration */:
                     return visitElidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -80530,13 +82567,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -80556,11 +82593,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 264 /* ExportDeclaration */ ||
-                node.kind === 258 /* ImportDeclaration */ ||
-                node.kind === 259 /* ImportClause */ ||
-                (node.kind === 257 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 269 /* ExternalModuleReference */)) {
+            if (node.kind === 267 /* ExportDeclaration */ ||
+                node.kind === 261 /* ImportDeclaration */ ||
+                node.kind === 262 /* ImportClause */ ||
+                (node.kind === 260 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 272 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -80584,19 +82621,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return visitConstructor(node);
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     // Property declarations are not TypeScript syntax, but they must be visited
                     // for the decorator transformation.
                     return visitPropertyDeclaration(node);
-                case 170 /* IndexSignature */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 164 /* MethodDeclaration */:
+                case 171 /* IndexSignature */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 226 /* SemicolonClassElement */:
+                case 229 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -80633,61 +82670,61 @@ var ts;
                 case 125 /* AbstractKeyword */:
                 case 84 /* ConstKeyword */:
                 case 133 /* DeclareKeyword */:
-                case 141 /* ReadonlyKeyword */:
+                case 142 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided
                 // falls through
-                case 177 /* ArrayType */:
-                case 178 /* TupleType */:
-                case 179 /* OptionalType */:
-                case 180 /* RestType */:
-                case 176 /* TypeLiteral */:
-                case 171 /* TypePredicate */:
-                case 158 /* TypeParameter */:
+                case 178 /* ArrayType */:
+                case 179 /* TupleType */:
+                case 180 /* OptionalType */:
+                case 181 /* RestType */:
+                case 177 /* TypeLiteral */:
+                case 172 /* TypePredicate */:
+                case 159 /* TypeParameter */:
                 case 128 /* AnyKeyword */:
-                case 151 /* UnknownKeyword */:
+                case 152 /* UnknownKeyword */:
                 case 131 /* BooleanKeyword */:
-                case 146 /* StringKeyword */:
-                case 143 /* NumberKeyword */:
-                case 140 /* NeverKeyword */:
+                case 147 /* StringKeyword */:
+                case 144 /* NumberKeyword */:
+                case 141 /* NeverKeyword */:
                 case 113 /* VoidKeyword */:
-                case 147 /* SymbolKeyword */:
-                case 174 /* ConstructorType */:
-                case 173 /* FunctionType */:
-                case 175 /* TypeQuery */:
-                case 172 /* TypeReference */:
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
-                case 183 /* ConditionalType */:
-                case 185 /* ParenthesizedType */:
-                case 186 /* ThisType */:
-                case 187 /* TypeOperator */:
-                case 188 /* IndexedAccessType */:
-                case 189 /* MappedType */:
-                case 190 /* LiteralType */:
+                case 148 /* SymbolKeyword */:
+                case 175 /* ConstructorType */:
+                case 174 /* FunctionType */:
+                case 176 /* TypeQuery */:
+                case 173 /* TypeReference */:
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
+                case 184 /* ConditionalType */:
+                case 186 /* ParenthesizedType */:
+                case 187 /* ThisType */:
+                case 188 /* TypeOperator */:
+                case 189 /* IndexedAccessType */:
+                case 190 /* MappedType */:
+                case 191 /* LiteralType */:
                 // TypeScript type nodes are elided.
                 // falls through
-                case 170 /* IndexSignature */:
+                case 171 /* IndexSignature */:
                 // TypeScript index signatures are elided.
                 // falls through
-                case 160 /* Decorator */:
+                case 161 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
                 // falls through
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 162 /* PropertyDeclaration */:
+                case 163 /* 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 256 /* NamespaceExportDeclaration */:
+                case 259 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return visitConstructor(node);
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return factory.createNotEmittedStatement(node);
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -80697,7 +82734,7 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 218 /* ClassExpression */:
+                case 221 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -80707,35 +82744,35 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 283 /* HeritageClause */:
+                case 286 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 220 /* ExpressionWithTypeArguments */:
+                case 223 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 166 /* GetAccessor */:
+                case 167 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 167 /* SetAccessor */:
+                case 168 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -80745,40 +82782,40 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 204 /* ParenthesizedExpression */:
+                case 207 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 203 /* TypeAssertionExpression */:
-                case 221 /* AsExpression */:
+                case 206 /* TypeAssertionExpression */:
+                case 224 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return visitCallExpression(node);
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return visitNewExpression(node);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 222 /* NonNullExpression */:
+                case 225 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node);
-                case 272 /* JsxOpeningElement */:
+                case 275 /* JsxOpeningElement */:
                     return visitJsxJsxOpeningElement(node);
                 default:
                     // node contains some other TypeScript syntax
@@ -81187,12 +83224,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -81345,7 +83382,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 162 /* PropertyDeclaration */
+                ? member.kind === 163 /* 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`.
                     ? factory.createVoidZero()
@@ -81469,10 +83506,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 164 /* MethodDeclaration */
-                || kind === 166 /* GetAccessor */
-                || kind === 167 /* SetAccessor */
-                || kind === 162 /* PropertyDeclaration */;
+            return kind === 165 /* MethodDeclaration */
+                || kind === 167 /* GetAccessor */
+                || kind === 168 /* SetAccessor */
+                || kind === 163 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -81482,7 +83519,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 164 /* MethodDeclaration */;
+            return node.kind === 165 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -81493,12 +83530,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -81515,15 +83552,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 162 /* PropertyDeclaration */:
-                case 159 /* Parameter */:
+                case 163 /* PropertyDeclaration */:
+                case 160 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 167 /* SetAccessor */:
-                case 166 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 167 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 164 /* MethodDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 165 /* MethodDeclaration */:
                     return factory.createIdentifier("Function");
                 default:
                     return factory.createVoidZero();
@@ -81560,7 +83597,7 @@ var ts;
             return factory.createArrayLiteralExpression(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 166 /* GetAccessor */) {
+            if (container && node.kind === 167 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -81606,30 +83643,30 @@ var ts;
             }
             switch (node.kind) {
                 case 113 /* VoidKeyword */:
-                case 149 /* UndefinedKeyword */:
-                case 140 /* NeverKeyword */:
+                case 150 /* UndefinedKeyword */:
+                case 141 /* NeverKeyword */:
                     return factory.createVoidZero();
-                case 185 /* ParenthesizedType */:
+                case 186 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 173 /* FunctionType */:
-                case 174 /* ConstructorType */:
+                case 174 /* FunctionType */:
+                case 175 /* ConstructorType */:
                     return factory.createIdentifier("Function");
-                case 177 /* ArrayType */:
-                case 178 /* TupleType */:
+                case 178 /* ArrayType */:
+                case 179 /* TupleType */:
                     return factory.createIdentifier("Array");
-                case 171 /* TypePredicate */:
+                case 172 /* TypePredicate */:
                 case 131 /* BooleanKeyword */:
                     return factory.createIdentifier("Boolean");
-                case 146 /* StringKeyword */:
+                case 147 /* StringKeyword */:
                     return factory.createIdentifier("String");
-                case 144 /* ObjectKeyword */:
+                case 145 /* ObjectKeyword */:
                     return factory.createIdentifier("Object");
-                case 190 /* LiteralType */:
+                case 191 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                         case 14 /* NoSubstitutionTemplateLiteral */:
                             return factory.createIdentifier("String");
-                        case 211 /* PrefixUnaryExpression */:
+                        case 214 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return factory.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
@@ -81642,45 +83679,45 @@ var ts;
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 143 /* NumberKeyword */:
+                case 144 /* NumberKeyword */:
                     return factory.createIdentifier("Number");
-                case 154 /* BigIntKeyword */:
+                case 155 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 147 /* SymbolKeyword */:
+                case 148 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : factory.createIdentifier("Symbol");
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 182 /* IntersectionType */:
-                case 181 /* UnionType */:
+                case 183 /* IntersectionType */:
+                case 182 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 183 /* ConditionalType */:
+                case 184 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 187 /* TypeOperator */:
-                    if (node.operator === 141 /* ReadonlyKeyword */) {
+                case 188 /* TypeOperator */:
+                    if (node.operator === 142 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 175 /* TypeQuery */:
-                case 188 /* IndexedAccessType */:
-                case 189 /* MappedType */:
-                case 176 /* TypeLiteral */:
+                case 176 /* TypeQuery */:
+                case 189 /* IndexedAccessType */:
+                case 190 /* MappedType */:
+                case 177 /* TypeLiteral */:
                 case 128 /* AnyKeyword */:
-                case 151 /* UnknownKeyword */:
-                case 186 /* ThisType */:
-                case 192 /* ImportType */:
+                case 152 /* UnknownKeyword */:
+                case 187 /* ThisType */:
+                case 195 /* ImportType */:
                     break;
                 // handle JSDoc types from an invalid parse
-                case 299 /* JSDocAllType */:
-                case 300 /* JSDocUnknownType */:
-                case 304 /* JSDocFunctionType */:
-                case 305 /* JSDocVariadicType */:
-                case 306 /* JSDocNamepathType */:
+                case 303 /* JSDocAllType */:
+                case 304 /* JSDocUnknownType */:
+                case 308 /* JSDocFunctionType */:
+                case 309 /* JSDocVariadicType */:
+                case 310 /* JSDocNamepathType */:
                     break;
-                case 301 /* JSDocNullableType */:
-                case 302 /* JSDocNonNullableType */:
-                case 303 /* JSDocOptionalType */:
+                case 305 /* JSDocNullableType */:
+                case 306 /* JSDocNonNullableType */:
+                case 307 /* JSDocOptionalType */:
                     return serializeTypeNode(node.type);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -81691,15 +83728,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_21 = types; _i < types_21.length; _i++) {
-                var typeNode = types_21[_i];
-                while (typeNode.kind === 185 /* ParenthesizedType */) {
+            for (var _i = 0, types_22 = types; _i < types_22.length; _i++) {
+                var typeNode = types_22[_i];
+                while (typeNode.kind === 186 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 140 /* NeverKeyword */) {
+                if (typeNode.kind === 141 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 190 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 149 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 191 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 150 /* 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);
@@ -81809,7 +83846,7 @@ var ts;
                     name.original = undefined;
                     ts.setParent(name, ts.getParseTreeNode(currentLexicalScope)); // ensure the parent is set to a parse tree node.
                     return name;
-                case 156 /* QualifiedName */:
+                case 157 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -82383,12 +84420,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = factory.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), factory.createVariableDeclarationList([
                 factory.createVariableDeclaration(factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 294 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 297 /* 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 === 252 /* EnumDeclaration */) {
+                if (node.kind === 255 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -82513,7 +84550,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             if (node.body) {
-                if (node.body.kind === 254 /* ModuleBlock */) {
+                if (node.body.kind === 257 /* ModuleBlock */) {
                     saveStateAndInvoke(node.body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                     statementsLocation = node.body.statements;
                     blockLocation = node.body;
@@ -82560,13 +84597,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 (!node.body || node.body.kind !== 254 /* ModuleBlock */) {
+            if (!node.body || node.body.kind !== 257 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 253 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 256 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -82616,7 +84653,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 260 /* NamespaceImport */) {
+            if (node.kind === 263 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -82865,16 +84902,16 @@ var ts;
                 // 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(78 /* Identifier */);
-                context.enableSubstitution(286 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(289 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(253 /* ModuleDeclaration */);
+                context.enableEmitNotification(256 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 253 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 256 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 252 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 255 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -82935,9 +84972,9 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -82975,9 +85012,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 !== 294 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 253 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 252 /* EnumDeclaration */);
+                if (container && container.kind !== 297 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 256 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 255 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -83077,40 +85114,40 @@ var ts;
             if (!(node.transformFlags & 4194304 /* ContainsClassFields */))
                 return node;
             switch (node.kind) {
-                case 218 /* ClassExpression */:
-                case 249 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
                     return visitClassLike(node);
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return visitPropertyDeclaration(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return visitPropertyAccessExpression(node);
-                case 211 /* PrefixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return visitPrefixUnaryExpression(node);
-                case 212 /* PostfixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     return visitPostfixUnaryExpression(node, /*valueIsDiscarded*/ false);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return visitCallExpression(node);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 case 79 /* PrivateIdentifier */:
                     return visitPrivateIdentifier(node);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return visitForStatement(node);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
             }
             return ts.visitEachChild(node, visitor, context);
         }
         function visitorDestructuringTarget(node) {
             switch (node.kind) {
-                case 197 /* ObjectLiteralExpression */:
-                case 196 /* ArrayLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return visitAssignmentPattern(node);
                 default:
                     return visitor(node);
@@ -83133,20 +85170,20 @@ var ts;
          */
         function classElementVisitor(node) {
             switch (node.kind) {
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     // Constructors for classes using class fields are transformed in
                     // `visitClassDeclaration` or `visitClassExpression`.
                     return undefined;
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 164 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
                     // Visit the name of the member (if it's a computed property name).
                     return ts.visitEachChild(node, classElementVisitor, context);
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return visitPropertyDeclaration(node);
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 226 /* SemicolonClassElement */:
+                case 229 /* SemicolonClassElement */:
                     return node;
                 default:
                     return visitor(node);
@@ -83898,31 +85935,31 @@ var ts;
                 case 129 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 210 /* AwaitExpression */:
+                case 213 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitMethodDeclaration, node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionDeclaration, node);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionExpression, node);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     return doWithContext(1 /* NonTopLevel */, visitArrowFunction, node);
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) {
                         capturedSuperProperties.add(node.name.escapedText);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 165 /* Constructor */:
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 166 /* Constructor */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitDefault, node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -83931,27 +85968,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 229 /* VariableStatement */:
+                    case 232 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 234 /* ForStatement */:
+                    case 237 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 235 /* ForInStatement */:
+                    case 238 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 236 /* ForOfStatement */:
+                    case 239 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 284 /* CatchClause */:
+                    case 287 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 227 /* Block */:
-                    case 241 /* SwitchStatement */:
-                    case 255 /* CaseBlock */:
-                    case 281 /* CaseClause */:
-                    case 282 /* DefaultClause */:
-                    case 244 /* TryStatement */:
-                    case 232 /* DoStatement */:
-                    case 233 /* WhileStatement */:
-                    case 231 /* IfStatement */:
-                    case 240 /* WithStatement */:
-                    case 242 /* LabeledStatement */:
+                    case 230 /* Block */:
+                    case 244 /* SwitchStatement */:
+                    case 258 /* CaseBlock */:
+                    case 284 /* CaseClause */:
+                    case 285 /* DefaultClause */:
+                    case 247 /* TryStatement */:
+                    case 235 /* DoStatement */:
+                    case 236 /* WhileStatement */:
+                    case 234 /* IfStatement */:
+                    case 243 /* WithStatement */:
+                    case 245 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -84156,7 +86193,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 === 206 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 209 /* 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
@@ -84247,17 +86284,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(200 /* CallExpression */);
-                context.enableSubstitution(198 /* PropertyAccessExpression */);
-                context.enableSubstitution(199 /* ElementAccessExpression */);
+                context.enableSubstitution(203 /* CallExpression */);
+                context.enableSubstitution(201 /* PropertyAccessExpression */);
+                context.enableSubstitution(202 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(249 /* ClassDeclaration */);
-                context.enableEmitNotification(164 /* MethodDeclaration */);
-                context.enableEmitNotification(166 /* GetAccessor */);
-                context.enableEmitNotification(167 /* SetAccessor */);
-                context.enableEmitNotification(165 /* Constructor */);
+                context.enableEmitNotification(252 /* ClassDeclaration */);
+                context.enableEmitNotification(165 /* MethodDeclaration */);
+                context.enableEmitNotification(167 /* GetAccessor */);
+                context.enableEmitNotification(168 /* SetAccessor */);
+                context.enableEmitNotification(166 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(229 /* VariableStatement */);
+                context.enableEmitNotification(232 /* VariableStatement */);
             }
         }
         /**
@@ -84305,11 +86342,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
@@ -84341,11 +86378,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 249 /* ClassDeclaration */
-                || kind === 165 /* Constructor */
-                || kind === 164 /* MethodDeclaration */
-                || kind === 166 /* GetAccessor */
-                || kind === 167 /* SetAccessor */;
+            return kind === 252 /* ClassDeclaration */
+                || kind === 166 /* Constructor */
+                || kind === 165 /* MethodDeclaration */
+                || kind === 167 /* GetAccessor */
+                || kind === 168 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -84496,10 +86533,10 @@ var ts;
             return visited;
         }
         function visitor(node) {
-            return visitorWorker(node, /*noDestructuringValue*/ false);
+            return visitorWorker(node, /*expressionResultIsUnused*/ false);
         }
-        function visitorNoDestructuringValue(node) {
-            return visitorWorker(node, /*noDestructuringValue*/ true);
+        function visitorWithUnusedExpressionResult(node) {
+            return visitorWorker(node, /*expressionResultIsUnused*/ true);
         }
         function visitorNoAsyncModifier(node) {
             if (node.kind === 129 /* AsyncKeyword */) {
@@ -84519,73 +86556,79 @@ var ts;
         function visitDefault(node) {
             return ts.visitEachChild(node, visitor, context);
         }
-        function visitorWorker(node, noDestructuringValue) {
+        /**
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
+         */
+        function visitorWorker(node, expressionResultIsUnused) {
             if ((node.transformFlags & 32 /* ContainsES2018 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 210 /* AwaitExpression */:
+                case 213 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 213 /* BinaryExpression */:
-                    return visitBinaryExpression(node, noDestructuringValue);
-                case 284 /* CatchClause */:
+                case 216 /* BinaryExpression */:
+                    return visitBinaryExpression(node, expressionResultIsUnused);
+                case 337 /* CommaListExpression */:
+                    return visitCommaListExpression(node, expressionResultIsUnused);
+                case 287 /* CatchClause */:
                     return visitCatchClause(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
-                case 235 /* ForInStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
+                case 238 /* ForInStatement */:
                     return doWithHierarchyFacts(visitDefault, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return doWithHierarchyFacts(visitForStatement, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-                case 209 /* VoidExpression */:
+                case 212 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return doWithHierarchyFacts(visitConstructorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     return doWithHierarchyFacts(visitMethodDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 166 /* GetAccessor */:
+                case 167 /* GetAccessor */:
                     return doWithHierarchyFacts(visitGetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 167 /* SetAccessor */:
+                case 168 /* SetAccessor */:
                     return doWithHierarchyFacts(visitSetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return doWithHierarchyFacts(visitFunctionDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     return doWithHierarchyFacts(visitFunctionExpression, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     return doWithHierarchyFacts(visitArrowFunction, node, 2 /* ArrowFunctionExcludes */, 0 /* ArrowFunctionIncludes */);
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return visitParameter(node);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 204 /* ParenthesizedExpression */:
-                    return visitParenthesizedExpression(node, noDestructuringValue);
-                case 202 /* TaggedTemplateExpression */:
+                case 207 /* ParenthesizedExpression */:
+                    return visitParenthesizedExpression(node, expressionResultIsUnused);
+                case 205 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) {
                         capturedSuperProperties.add(node.name.escapedText);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return doWithHierarchyFacts(visitDefault, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -84621,7 +86664,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 236 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 239 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return factory.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, factory.liftToBlock), node);
@@ -84633,7 +86676,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 === 287 /* SpreadAssignment */) {
+                if (e.kind === 290 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(factory.createObjectLiteralExpression(chunkObject));
                         chunkObject = undefined;
@@ -84642,7 +86685,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 285 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 288 /* PropertyAssignment */
                         ? factory.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -84676,7 +86719,7 @@ var ts;
                 // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
                 // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 197 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 200 /* ObjectLiteralExpression */) {
                     objects.unshift(factory.createObjectLiteralExpression());
                 }
                 var expression = objects[0];
@@ -84693,10 +86736,14 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitExpressionStatement(node) {
-            return ts.visitEachChild(node, visitorNoDestructuringValue, context);
+            return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
         }
-        function visitParenthesizedExpression(node, noDestructuringValue) {
-            return ts.visitEachChild(node, noDestructuringValue ? visitorNoDestructuringValue : visitor, context);
+        /**
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
+         */
+        function visitParenthesizedExpression(node, expressionResultIsUnused) {
+            return ts.visitEachChild(node, expressionResultIsUnused ? visitorWithUnusedExpressionResult : visitor, context);
         }
         function visitSourceFile(node) {
             var ancestorFacts = enterSubtree(2 /* SourceFileExcludes */, ts.isEffectiveStrictModeSourceFile(node, compilerOptions) ?
@@ -84718,16 +86765,38 @@ var ts;
          * Visits a BinaryExpression that contains a destructuring assignment.
          *
          * @param node A BinaryExpression node.
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
          */
-        function visitBinaryExpression(node, noDestructuringValue) {
+        function visitBinaryExpression(node, expressionResultIsUnused) {
             if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
-                return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !noDestructuringValue);
+                return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !expressionResultIsUnused);
             }
-            else if (node.operatorToken.kind === 27 /* CommaToken */) {
-                return factory.updateBinaryExpression(node, ts.visitNode(node.left, visitorNoDestructuringValue, ts.isExpression), node.operatorToken, ts.visitNode(node.right, noDestructuringValue ? visitorNoDestructuringValue : visitor, ts.isExpression));
+            if (node.operatorToken.kind === 27 /* CommaToken */) {
+                return factory.updateBinaryExpression(node, ts.visitNode(node.left, visitorWithUnusedExpressionResult, ts.isExpression), node.operatorToken, ts.visitNode(node.right, expressionResultIsUnused ? visitorWithUnusedExpressionResult : visitor, ts.isExpression));
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        /**
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
+         */
+        function visitCommaListExpression(node, expressionResultIsUnused) {
+            if (expressionResultIsUnused) {
+                return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
+            }
+            var result;
+            for (var i = 0; i < node.elements.length; i++) {
+                var element = node.elements[i];
+                var visited = ts.visitNode(element, i < node.elements.length - 1 ? visitorWithUnusedExpressionResult : visitor, ts.isExpression);
+                if (result || visited !== element) {
+                    result || (result = node.elements.slice(0, i));
+                    result.push(visited);
+                }
+            }
+            var elements = result ? ts.setTextRange(factory.createNodeArray(result), node.elements) : node.elements;
+            return factory.updateCommaListExpression(node, elements);
+        }
         function visitCatchClause(node) {
             if (node.variableDeclaration &&
                 ts.isBindingPattern(node.variableDeclaration.name) &&
@@ -84779,10 +86848,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitForStatement(node) {
-            return factory.updateForStatement(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));
+            return factory.updateForStatement(node, ts.visitNode(node.initializer, visitorWithUnusedExpressionResult, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitorWithUnusedExpressionResult, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement));
         }
         function visitVoidExpression(node) {
-            return ts.visitEachChild(node, visitorNoDestructuringValue, context);
+            return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
         }
         /**
          * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
@@ -85063,17 +87132,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(200 /* CallExpression */);
-                context.enableSubstitution(198 /* PropertyAccessExpression */);
-                context.enableSubstitution(199 /* ElementAccessExpression */);
+                context.enableSubstitution(203 /* CallExpression */);
+                context.enableSubstitution(201 /* PropertyAccessExpression */);
+                context.enableSubstitution(202 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(249 /* ClassDeclaration */);
-                context.enableEmitNotification(164 /* MethodDeclaration */);
-                context.enableEmitNotification(166 /* GetAccessor */);
-                context.enableEmitNotification(167 /* SetAccessor */);
-                context.enableEmitNotification(165 /* Constructor */);
+                context.enableEmitNotification(252 /* ClassDeclaration */);
+                context.enableEmitNotification(165 /* MethodDeclaration */);
+                context.enableEmitNotification(167 /* GetAccessor */);
+                context.enableEmitNotification(168 /* SetAccessor */);
+                context.enableEmitNotification(166 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(229 /* VariableStatement */);
+                context.enableEmitNotification(232 /* VariableStatement */);
             }
         }
         /**
@@ -85121,11 +87190,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
@@ -85157,11 +87226,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 249 /* ClassDeclaration */
-                || kind === 165 /* Constructor */
-                || kind === 164 /* MethodDeclaration */
-                || kind === 166 /* GetAccessor */
-                || kind === 167 /* SetAccessor */;
+            return kind === 252 /* ClassDeclaration */
+                || kind === 166 /* Constructor */
+                || kind === 165 /* MethodDeclaration */
+                || kind === 167 /* GetAccessor */
+                || kind === 168 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -85193,7 +87262,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -85225,21 +87294,21 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */:
-                case 200 /* CallExpression */:
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */:
+                case 203 /* CallExpression */:
                     if (node.flags & 32 /* OptionalChain */) {
                         var updated = visitOptionalExpression(node, /*captureThisArg*/ false, /*isDelete*/ false);
                         ts.Debug.assertNotNode(updated, ts.isSyntheticReference);
                         return updated;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     if (node.operatorToken.kind === 60 /* QuestionQuestionToken */) {
                         return transformNullishCoalescingExpression(node);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 207 /* DeleteExpression */:
+                case 210 /* DeleteExpression */:
                     return visitDeleteExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -85282,7 +87351,7 @@ var ts;
                     thisArg = expression;
                 }
             }
-            expression = node.kind === 198 /* PropertyAccessExpression */
+            expression = node.kind === 201 /* PropertyAccessExpression */
                 ? factory.updatePropertyAccessExpression(node, expression, ts.visitNode(node.name, visitor, ts.isIdentifier))
                 : factory.updateElementAccessExpression(node, expression, ts.visitNode(node.argumentExpression, visitor, ts.isExpression));
             return thisArg ? factory.createSyntheticReferenceExpression(expression, thisArg) : expression;
@@ -85296,10 +87365,10 @@ var ts;
         }
         function visitNonOptionalExpression(node, captureThisArg, isDelete) {
             switch (node.kind) {
-                case 204 /* ParenthesizedExpression */: return visitNonOptionalParenthesizedExpression(node, captureThisArg, isDelete);
-                case 198 /* PropertyAccessExpression */:
-                case 199 /* ElementAccessExpression */: return visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete);
-                case 200 /* CallExpression */: return visitNonOptionalCallExpression(node, captureThisArg);
+                case 207 /* ParenthesizedExpression */: return visitNonOptionalParenthesizedExpression(node, captureThisArg, isDelete);
+                case 201 /* PropertyAccessExpression */:
+                case 202 /* ElementAccessExpression */: return visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete);
+                case 203 /* CallExpression */: return visitNonOptionalCallExpression(node, captureThisArg);
                 default: return ts.visitNode(node, visitor, ts.isExpression);
             }
         }
@@ -85319,8 +87388,8 @@ var ts;
             for (var i = 0; i < chain.length; i++) {
                 var segment = chain[i];
                 switch (segment.kind) {
-                    case 198 /* PropertyAccessExpression */:
-                    case 199 /* ElementAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         if (i === chain.length - 1 && captureThisArg) {
                             if (!ts.isSimpleCopiableExpression(rightExpression)) {
                                 thisArg = factory.createTempVariable(hoistVariableDeclaration);
@@ -85331,11 +87400,11 @@ var ts;
                                 thisArg = rightExpression;
                             }
                         }
-                        rightExpression = segment.kind === 198 /* PropertyAccessExpression */
+                        rightExpression = segment.kind === 201 /* PropertyAccessExpression */
                             ? factory.createPropertyAccessExpression(rightExpression, ts.visitNode(segment.name, visitor, ts.isIdentifier))
                             : factory.createElementAccessExpression(rightExpression, ts.visitNode(segment.argumentExpression, visitor, ts.isExpression));
                         break;
-                    case 200 /* CallExpression */:
+                    case 203 /* CallExpression */:
                         if (i === 0 && leftThisArg) {
                             rightExpression = factory.createFunctionCallCall(rightExpression, leftThisArg.kind === 105 /* SuperKeyword */ ? factory.createThis() : leftThisArg, ts.visitNodes(segment.arguments, visitor, ts.isExpression));
                         }
@@ -85392,7 +87461,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     var binaryExpression = node;
                     if (ts.isLogicalOrCoalescingAssignmentExpression(binaryExpression)) {
                         return transformLogicalAssignment(binaryExpression);
@@ -85437,7 +87506,49 @@ var ts;
         var factory = context.factory, emitHelpers = context.getEmitHelperFactory;
         var compilerOptions = context.getCompilerOptions();
         var currentSourceFile;
+        var currentFileState;
         return ts.chainBundle(context, transformSourceFile);
+        function getCurrentFileNameExpression() {
+            if (currentFileState.filenameDeclaration) {
+                return currentFileState.filenameDeclaration.name;
+            }
+            var declaration = factory.createVariableDeclaration(factory.createUniqueName("_jsxFileName", 16 /* Optimistic */ | 32 /* FileLevel */), /*exclaimationToken*/ undefined, /*type*/ undefined, factory.createStringLiteral(currentSourceFile.fileName));
+            currentFileState.filenameDeclaration = declaration;
+            return currentFileState.filenameDeclaration.name;
+        }
+        function getJsxFactoryCalleePrimitive(childrenLength) {
+            return compilerOptions.jsx === 5 /* ReactJSXDev */ ? "jsxDEV" : childrenLength > 1 ? "jsxs" : "jsx";
+        }
+        function getJsxFactoryCallee(childrenLength) {
+            var type = getJsxFactoryCalleePrimitive(childrenLength);
+            return getImplicitImportForName(type);
+        }
+        function getImplicitJsxFragmentReference() {
+            return getImplicitImportForName("Fragment");
+        }
+        function getImplicitImportForName(name) {
+            var _a, _b;
+            var importSource = name === "createElement"
+                ? currentFileState.importSpecifier
+                : ts.getJSXRuntimeImport(currentFileState.importSpecifier, compilerOptions);
+            var existing = (_b = (_a = currentFileState.utilizedImplicitRuntimeImports) === null || _a === void 0 ? void 0 : _a.get(importSource)) === null || _b === void 0 ? void 0 : _b.get(name);
+            if (existing) {
+                return existing.name;
+            }
+            if (!currentFileState.utilizedImplicitRuntimeImports) {
+                currentFileState.utilizedImplicitRuntimeImports = ts.createMap();
+            }
+            var specifierSourceImports = currentFileState.utilizedImplicitRuntimeImports.get(importSource);
+            if (!specifierSourceImports) {
+                specifierSourceImports = ts.createMap();
+                currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
+            }
+            var generatedName = factory.createUniqueName("_" + name, 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
+            var specifier = factory.createImportSpecifier(factory.createIdentifier(name), generatedName);
+            generatedName.generatedImportReference = specifier;
+            specifierSourceImports.set(name, specifier);
+            return generatedName;
+        }
         /**
          * Transform JSX-specific syntax in a SourceFile.
          *
@@ -85448,8 +87559,42 @@ var ts;
                 return node;
             }
             currentSourceFile = node;
+            currentFileState = {};
+            currentFileState.importSpecifier = ts.getJSXImplicitImportBase(compilerOptions, node);
             var visited = ts.visitEachChild(node, visitor, context);
             ts.addEmitHelpers(visited, context.readEmitHelpers());
+            var statements = visited.statements;
+            if (currentFileState.filenameDeclaration) {
+                statements = ts.insertStatementAfterCustomPrologue(statements.slice(), factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList([currentFileState.filenameDeclaration], 2 /* Const */)));
+            }
+            if (currentFileState.utilizedImplicitRuntimeImports) {
+                for (var _i = 0, _a = ts.arrayFrom(currentFileState.utilizedImplicitRuntimeImports.entries()); _i < _a.length; _i++) {
+                    var _b = _a[_i], importSource = _b[0], importSpecifiersMap = _b[1];
+                    if (ts.isExternalModule(node)) {
+                        // Add `import` statement
+                        var importStatement = factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, factory.createImportClause(/*typeOnly*/ false, /*name*/ undefined, factory.createNamedImports(ts.arrayFrom(importSpecifiersMap.values()))), factory.createStringLiteral(importSource));
+                        ts.setParentRecursive(importStatement, /*incremental*/ false);
+                        statements = ts.insertStatementAfterCustomPrologue(statements.slice(), importStatement);
+                    }
+                    else if (ts.isExternalOrCommonJsModule(node)) {
+                        // Add `require` statement
+                        var requireStatement = factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList([
+                            factory.createVariableDeclaration(factory.createObjectBindingPattern(ts.map(ts.arrayFrom(importSpecifiersMap.values()), function (s) { return factory.createBindingElement(/*dotdotdot*/ undefined, s.propertyName, s.name); })), 
+                            /*exclaimationToken*/ undefined, 
+                            /*type*/ undefined, factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, [factory.createStringLiteral(importSource)]))
+                        ], 2 /* Const */));
+                        ts.setParentRecursive(requireStatement, /*incremental*/ false);
+                        statements = ts.insertStatementAfterCustomPrologue(statements.slice(), requireStatement);
+                    }
+                    else {
+                        // Do nothing (script file) - consider an error in the checker?
+                    }
+                }
+            }
+            if (statements !== visited.statements) {
+                visited = factory.updateSourceFile(visited, statements);
+            }
+            currentFileState = undefined;
             return visited;
         }
         function visitor(node) {
@@ -85462,13 +87607,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 270 /* JsxElement */:
+                case 273 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 274 /* JsxFragment */:
+                case 277 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 280 /* JsxExpression */:
+                case 283 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -85478,28 +87623,122 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 280 /* JsxExpression */:
+                case 283 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 270 /* JsxElement */:
+                case 273 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 274 /* JsxFragment */:
+                case 277 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
             }
         }
+        /**
+         * The react jsx/jsxs transform falls back to `createElement` when an explicit `key` argument comes after a spread
+         */
+        function hasKeyAfterPropsSpread(node) {
+            var spread = false;
+            for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
+                var elem = _a[_i];
+                if (ts.isJsxSpreadAttribute(elem)) {
+                    spread = true;
+                }
+                else if (spread && ts.isJsxAttribute(elem) && elem.name.escapedText === "key") {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function shouldUseCreateElement(node) {
+            return currentFileState.importSpecifier === undefined || hasKeyAfterPropsSpread(node);
+        }
         function visitJsxElement(node, isChild) {
-            return visitJsxOpeningLikeElement(node.openingElement, node.children, isChild, /*location*/ node);
+            var tagTransform = shouldUseCreateElement(node.openingElement) ? visitJsxOpeningLikeElementCreateElement : visitJsxOpeningLikeElementJSX;
+            return tagTransform(node.openingElement, node.children, isChild, /*location*/ node);
         }
         function visitJsxSelfClosingElement(node, isChild) {
-            return visitJsxOpeningLikeElement(node, /*children*/ undefined, isChild, /*location*/ node);
+            var tagTransform = shouldUseCreateElement(node) ? visitJsxOpeningLikeElementCreateElement : visitJsxOpeningLikeElementJSX;
+            return tagTransform(node, /*children*/ undefined, isChild, /*location*/ node);
         }
         function visitJsxFragment(node, isChild) {
-            return visitJsxOpeningFragment(node.openingFragment, node.children, isChild, /*location*/ node);
+            var tagTransform = currentFileState.importSpecifier === undefined ? visitJsxOpeningFragmentCreateElement : visitJsxOpeningFragmentJSX;
+            return tagTransform(node.openingFragment, node.children, isChild, /*location*/ node);
+        }
+        function convertJsxChildrenToChildrenPropObject(children) {
+            var nonWhitespaceChildren = ts.getSemanticJsxChildren(children);
+            if (ts.length(nonWhitespaceChildren) === 1) {
+                var result_13 = transformJsxChildToExpression(nonWhitespaceChildren[0]);
+                return result_13 && factory.createObjectLiteralExpression([
+                    factory.createPropertyAssignment("children", result_13)
+                ]);
+            }
+            var result = ts.mapDefined(children, transformJsxChildToExpression);
+            return !result.length ? undefined : factory.createObjectLiteralExpression([
+                factory.createPropertyAssignment("children", factory.createArrayLiteralExpression(result))
+            ]);
         }
-        function visitJsxOpeningLikeElement(node, children, isChild, location) {
+        function visitJsxOpeningLikeElementJSX(node, children, isChild, location) {
+            var tagName = getTagName(node);
+            var objectProperties;
+            var keyAttr = ts.find(node.attributes.properties, function (p) { return !!p.name && ts.isIdentifier(p.name) && p.name.escapedText === "key"; });
+            var attrs = keyAttr ? ts.filter(node.attributes.properties, function (p) { return p !== keyAttr; }) : node.attributes.properties;
+            var segments = [];
+            if (attrs.length) {
+                // Map spans of JsxAttribute nodes into object literals and spans
+                // of JsxSpreadAttribute nodes into expressions.
+                segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
+                    ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
+                    : factory.createObjectLiteralExpression(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); }));
+                if (ts.isJsxSpreadAttribute(attrs[0])) {
+                    // We must always emit at least one object literal before a spread
+                    // argument.factory.createObjectLiteral
+                    segments.unshift(factory.createObjectLiteralExpression());
+                }
+            }
+            if (children && children.length) {
+                var result = convertJsxChildrenToChildrenPropObject(children);
+                if (result) {
+                    segments.push(result);
+                }
+            }
+            if (segments.length === 0) {
+                objectProperties = factory.createObjectLiteralExpression([]);
+                // When there are no attributes, React wants {}
+            }
+            else {
+                // Either emit one big object literal (no spread attribs), or
+                // a call to the __assign helper.
+                objectProperties = ts.singleOrUndefined(segments) || emitHelpers().createAssignHelper(segments);
+            }
+            return visitJsxOpeningLikeElementOrFragmentJSX(tagName, objectProperties, keyAttr, ts.length(ts.getSemanticJsxChildren(children || ts.emptyArray)), isChild, location);
+        }
+        function visitJsxOpeningLikeElementOrFragmentJSX(tagName, objectProperties, keyAttr, childrenLength, isChild, location) {
+            var args = [tagName, objectProperties, !keyAttr ? factory.createVoidZero() : transformJsxAttributeInitializer(keyAttr.initializer)];
+            if (compilerOptions.jsx === 5 /* ReactJSXDev */) {
+                var originalFile = ts.getOriginalNode(currentSourceFile);
+                if (originalFile && ts.isSourceFile(originalFile)) {
+                    // isStaticChildren development flag
+                    args.push(childrenLength > 1 ? factory.createTrue() : factory.createFalse());
+                    // __source development flag
+                    var lineCol = ts.getLineAndCharacterOfPosition(originalFile, location.pos);
+                    args.push(factory.createObjectLiteralExpression([
+                        factory.createPropertyAssignment("fileName", getCurrentFileNameExpression()),
+                        factory.createPropertyAssignment("lineNumber", factory.createNumericLiteral(lineCol.line + 1)),
+                        factory.createPropertyAssignment("columnNumber", factory.createNumericLiteral(lineCol.character + 1))
+                    ]));
+                    // __self development flag
+                    args.push(factory.createThis());
+                }
+            }
+            var element = ts.setTextRange(factory.createCallExpression(getJsxFactoryCallee(childrenLength), /*typeArguments*/ undefined, args), location);
+            if (isChild) {
+                ts.startOnNewLine(element);
+            }
+            return element;
+        }
+        function visitJsxOpeningLikeElementCreateElement(node, children, isChild, location) {
             var tagName = getTagName(node);
             var objectProperties;
             var attrs = node.attributes.properties;
@@ -85525,14 +87764,28 @@ var ts;
                     objectProperties = emitHelpers().createAssignHelper(segments);
                 }
             }
-            var element = ts.createExpressionForJsxElement(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
-            tagName, objectProperties, ts.mapDefined(children, transformJsxChildToExpression), node, location);
+            var callee = currentFileState.importSpecifier === undefined
+                ? ts.createJsxFactoryExpression(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
+                node)
+                : getImplicitImportForName("createElement");
+            var element = ts.createExpressionForJsxElement(factory, callee, tagName, objectProperties, ts.mapDefined(children, transformJsxChildToExpression), location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
             return element;
         }
-        function visitJsxOpeningFragment(node, children, isChild, location) {
+        function visitJsxOpeningFragmentJSX(_node, children, isChild, location) {
+            var childrenProps;
+            if (children && children.length) {
+                var result = convertJsxChildrenToChildrenPropObject(children);
+                if (result) {
+                    childrenProps = result;
+                }
+            }
+            return visitJsxOpeningLikeElementOrFragmentJSX(getImplicitJsxFragmentReference(), childrenProps || factory.createObjectLiteralExpression([]), 
+            /*keyAttr*/ undefined, ts.length(ts.getSemanticJsxChildren(children)), isChild, location);
+        }
+        function visitJsxOpeningFragmentCreateElement(node, children, isChild, location) {
             var element = ts.createExpressionForJsxFragment(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), context.getEmitResolver().getJsxFragmentFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
             ts.mapDefined(children, transformJsxChildToExpression), node, location);
             if (isChild) {
@@ -85559,7 +87812,7 @@ var ts;
                 var literal = factory.createStringLiteral(tryDecodeEntities(node.text) || node.text, singleQuote);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 280 /* JsxExpression */) {
+            else if (node.kind === 283 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return factory.createTrue();
                 }
@@ -85653,7 +87906,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 270 /* JsxElement */) {
+            if (node.kind === 273 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -85959,7 +88212,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -86172,7 +88425,7 @@ var ts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
             return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 239 /* ReturnStatement */
+                && node.kind === 242 /* ReturnStatement */
                 && !node.expression;
         }
         function isOrMayContainReturnCompletion(node) {
@@ -86198,12 +88451,10 @@ var ts;
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
         function visitor(node) {
-            if (shouldVisitNode(node)) {
-                return visitJavaScript(node);
-            }
-            else {
-                return node;
-            }
+            return shouldVisitNode(node) ? visitorWorker(node, /*expressionResultIsUnused*/ false) : node;
+        }
+        function visitorWithUnusedExpressionResult(node) {
+            return shouldVisitNode(node) ? visitorWorker(node, /*expressionResultIsUnused*/ true) : node;
         }
         function callExpressionVisitor(node) {
             if (node.kind === 105 /* SuperKeyword */) {
@@ -86211,68 +88462,70 @@ var ts;
             }
             return visitor(node);
         }
-        function visitJavaScript(node) {
+        function visitorWorker(node, expressionResultIsUnused) {
             switch (node.kind) {
                 case 123 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 218 /* ClassExpression */:
+                case 221 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 159 /* Parameter */:
+                case 160 /* Parameter */:
                     return visitParameter(node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
                 case 78 /* Identifier */:
                     return visitIdentifier(node);
-                case 247 /* VariableDeclarationList */:
+                case 250 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 255 /* CaseBlock */:
+                case 258 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 227 /* Block */:
+                case 230 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 238 /* BreakStatement */:
-                case 237 /* ContinueStatement */:
+                case 241 /* BreakStatement */:
+                case 240 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return visitCatchClause(node);
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return visitCallExpression(node);
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return visitNewExpression(node);
-                case 204 /* ParenthesizedExpression */:
-                    return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 213 /* BinaryExpression */:
-                    return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
+                case 207 /* ParenthesizedExpression */:
+                    return visitParenthesizedExpression(node, expressionResultIsUnused);
+                case 216 /* BinaryExpression */:
+                    return visitBinaryExpression(node, expressionResultIsUnused);
+                case 337 /* CommaListExpression */:
+                    return visitCommaListExpression(node, expressionResultIsUnused);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
                 case 16 /* TemplateMiddle */:
@@ -86282,29 +88535,31 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 202 /* TaggedTemplateExpression */:
+                case 205 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 215 /* TemplateExpression */:
+                case 218 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 217 /* SpreadElement */:
+                case 220 /* SpreadElement */:
                     return visitSpreadElement(node);
                 case 105 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
                 case 107 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 223 /* MetaProperty */:
+                case 226 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return visitReturnStatement(node);
+                case 212 /* VoidExpression */:
+                    return visitVoidExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
@@ -86375,6 +88630,9 @@ var ts;
             }
             return node;
         }
+        function visitVoidExpression(node) {
+            return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
+        }
         function visitIdentifier(node) {
             if (!convertedLoopState) {
                 return node;
@@ -86390,14 +88648,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 === 238 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 241 /* 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 === 238 /* BreakStatement */) {
+                        if (node.kind === 241 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -86408,7 +88666,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 238 /* BreakStatement */) {
+                        if (node.kind === 241 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -86560,16 +88818,17 @@ var ts;
          */
         function transformClassBody(node, extendsClauseElement) {
             var statements = [];
+            var name = factory.getInternalName(node);
+            var constructorLikeName = ts.isIdentifierANonContextualKeyword(name) ? factory.getGeneratedNameForNode(name) : name;
             startLexicalEnvironment();
             addExtendsHelperIfNeeded(statements, node, extendsClauseElement);
-            addConstructor(statements, node, extendsClauseElement);
+            addConstructor(statements, node, constructorLikeName, 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 = factory.getInternalName(node);
             // The following partially-emitted expression exists purely to align our sourcemap
             // emit with the original emitter.
-            var outer = factory.createPartiallyEmittedExpression(localName);
+            var outer = factory.createPartiallyEmittedExpression(constructorLikeName);
             ts.setTextRangeEnd(outer, closingBraceLocation.end);
             ts.setEmitFlags(outer, 1536 /* NoComments */);
             var statement = factory.createReturnStatement(outer);
@@ -86601,7 +88860,7 @@ var ts;
          * @param node The ClassExpression or ClassDeclaration node.
          * @param extendsClauseElement The expression for the class `extends` clause.
          */
-        function addConstructor(statements, node, extendsClauseElement) {
+        function addConstructor(statements, node, name, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
@@ -86610,7 +88869,7 @@ var ts;
             var constructorFunction = factory.createFunctionDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, factory.getInternalName(node), 
+            /*asteriskToken*/ undefined, name, 
             /*typeParameters*/ undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), 
             /*type*/ undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper));
             ts.setTextRange(constructorFunction, constructor || node);
@@ -86805,11 +89064,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 239 /* ReturnStatement */) {
+            if (statement.kind === 242 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 231 /* IfStatement */) {
+            else if (statement.kind === 234 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -86817,7 +89076,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 227 /* Block */) {
+            else if (statement.kind === 230 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -87019,7 +89278,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 206 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 209 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, factory.createThis());
                 return true;
             }
@@ -87041,22 +89300,22 @@ var ts;
             if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 206 /* ArrowFunction */:
+                    case 209 /* ArrowFunction */:
                         return statements;
-                    case 164 /* MethodDeclaration */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 165 /* MethodDeclaration */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = factory.createVoidZero();
                         break;
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = factory.createPropertyAccessExpression(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* 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 = factory.createConditionalExpression(factory.createLogicalAnd(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), factory.createBinaryExpression(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), 101 /* InstanceOfKeyword */, factory.getLocalName(node))), 
@@ -87091,20 +89350,20 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 226 /* SemicolonClassElement */:
+                    case 229 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
@@ -87307,7 +89566,7 @@ var ts;
                 : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */)) {
                 name = factory.getGeneratedNameForNode(node);
             }
             exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
@@ -87353,7 +89612,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 206 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 209 /* 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
@@ -87419,51 +89678,55 @@ var ts;
          * @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 204 /* ParenthesizedExpression */:
-                    return factory.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 213 /* BinaryExpression */:
-                    return factory.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
-            }
-            return ts.visitEachChild(node, visitor, context);
+            return ts.visitEachChild(node, visitorWithUnusedExpressionResult, 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 204 /* ParenthesizedExpression */:
-                        return factory.updateParenthesizedExpression(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 213 /* BinaryExpression */:
-                        return factory.updateParenthesizedExpression(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
-                }
-            }
-            return ts.visitEachChild(node, visitor, context);
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
+         */
+        function visitParenthesizedExpression(node, expressionResultIsUnused) {
+            return ts.visitEachChild(node, expressionResultIsUnused ? visitorWithUnusedExpressionResult : 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.
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
          */
-        function visitBinaryExpression(node, needsDestructuringValue) {
+        function visitBinaryExpression(node, expressionResultIsUnused) {
             // 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.flattenDestructuringAssignment(node, visitor, context, 0 /* All */, !expressionResultIsUnused);
+            }
+            if (node.operatorToken.kind === 27 /* CommaToken */) {
+                return factory.updateBinaryExpression(node, ts.visitNode(node.left, visitorWithUnusedExpressionResult, ts.isExpression), node.operatorToken, ts.visitNode(node.right, expressionResultIsUnused ? visitorWithUnusedExpressionResult : visitor, ts.isExpression));
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        /**
+         * @param expressionResultIsUnused Indicates the result of an expression is unused by the parent node (i.e., the left side of a comma or the
+         * expression of an `ExpressionStatement`).
+         */
+        function visitCommaListExpression(node, expressionResultIsUnused) {
+            if (expressionResultIsUnused) {
+                return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
+            }
+            var result;
+            for (var i = 0; i < node.elements.length; i++) {
+                var element = node.elements[i];
+                var visited = ts.visitNode(element, i < node.elements.length - 1 ? visitorWithUnusedExpressionResult : visitor, ts.isExpression);
+                if (result || visited !== element) {
+                    result || (result = node.elements.slice(0, i));
+                    result.push(visited);
+                }
+            }
+            var elements = result ? ts.setTextRange(factory.createNodeArray(result), node.elements) : node.elements;
+            return factory.updateCommaListExpression(node, elements);
+        }
         function isVariableStatementOfTypeScriptClassWrapper(node) {
             return node.declarationList.declarations.length === 1
                 && !!node.declarationList.declarations[0].initializer
@@ -87656,14 +89919,14 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
@@ -87679,6 +89942,9 @@ var ts;
         function visitForStatement(node, outermostLabeledStatement) {
             return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
+        function visitEachChildOfForStatement(node) {
+            return factory.updateForStatement(node, ts.visitNode(node.initializer, visitorWithUnusedExpressionResult, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitorWithUnusedExpressionResult, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock));
+        }
         function visitForInStatement(node, outermostLabeledStatement) {
             return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
@@ -87721,7 +89987,7 @@ var ts;
                 // evaluated on every iteration.
                 var assignment = factory.createAssignment(initializer, boundValue);
                 if (ts.isDestructuringAssignment(assignment)) {
-                    statements.push(factory.createExpressionStatement(visitBinaryExpression(assignment, /*needsDestructuringValue*/ false)));
+                    statements.push(factory.createExpressionStatement(visitBinaryExpression(assignment, /*expressionResultIsUnused*/ true)));
                 }
                 else {
                     ts.setTextRangeEnd(assignment, initializer.end);
@@ -87846,7 +90112,7 @@ var ts;
                 var property = properties[i];
                 if ((property.transformFlags & 262144 /* ContainsYield */ &&
                     hierarchyFacts & 4 /* AsyncFunctionBody */)
-                    || (hasComputed = ts.Debug.checkDefined(property.name).kind === 157 /* ComputedPropertyName */)) {
+                    || (hasComputed = ts.Debug.checkDefined(property.name).kind === 158 /* ComputedPropertyName */)) {
                     numInitialProperties = i;
                     break;
                 }
@@ -87922,7 +90188,7 @@ var ts;
                 }
                 var result = convert
                     ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
-                    : factory.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
+                    : factory.restoreEnclosingLabel(ts.isForStatement(node) ? visitEachChildOfForStatement(node) : ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
                 }
@@ -87962,18 +90228,18 @@ var ts;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 234 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 235 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 236 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 232 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 233 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 237 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 238 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 239 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 235 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 236 /* 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 factory.updateForStatement(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);
+            return factory.updateForStatement(node, ts.visitNode(initializerFunction ? initializerFunction.part : node.initializer, visitorWithUnusedExpressionResult, ts.isForInitializer), ts.visitNode(shouldConvertCondition ? undefined : node.condition, visitor, ts.isExpression), ts.visitNode(shouldConvertIncrementor ? undefined : node.incrementor, visitorWithUnusedExpressionResult, ts.isExpression), convertedLoopBody);
         }
         function convertForOfStatement(node, convertedLoopBody) {
             return factory.updateForOfStatement(node, 
@@ -87991,11 +90257,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 247 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 250 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -88403,20 +90669,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 285 /* PropertyAssignment */:
+                    case 288 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 286 /* ShorthandPropertyAssignment */:
+                    case 289 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -88523,7 +90789,7 @@ var ts;
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 166 /* GetAccessor */) {
+            if (node.kind === 167 /* GetAccessor */) {
                 updated = factory.updateGetAccessorDeclaration(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
@@ -89015,13 +91281,13 @@ var ts;
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
                 context.enableSubstitution(107 /* ThisKeyword */);
-                context.enableEmitNotification(165 /* Constructor */);
-                context.enableEmitNotification(164 /* MethodDeclaration */);
-                context.enableEmitNotification(166 /* GetAccessor */);
-                context.enableEmitNotification(167 /* SetAccessor */);
-                context.enableEmitNotification(206 /* ArrowFunction */);
-                context.enableEmitNotification(205 /* FunctionExpression */);
-                context.enableEmitNotification(248 /* FunctionDeclaration */);
+                context.enableEmitNotification(166 /* Constructor */);
+                context.enableEmitNotification(165 /* MethodDeclaration */);
+                context.enableEmitNotification(167 /* GetAccessor */);
+                context.enableEmitNotification(168 /* SetAccessor */);
+                context.enableEmitNotification(209 /* ArrowFunction */);
+                context.enableEmitNotification(208 /* FunctionExpression */);
+                context.enableEmitNotification(251 /* FunctionDeclaration */);
             }
         }
         /**
@@ -89062,10 +91328,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 195 /* BindingElement */:
-                case 249 /* ClassDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 246 /* VariableDeclaration */:
+                case 198 /* BindingElement */:
+                case 252 /* ClassDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -89147,11 +91413,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 230 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 233 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 200 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 203 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -89159,7 +91425,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 217 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 220 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -89185,15 +91451,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(272 /* JsxOpeningElement */);
-            context.enableEmitNotification(273 /* JsxClosingElement */);
-            context.enableEmitNotification(271 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(275 /* JsxOpeningElement */);
+            context.enableEmitNotification(276 /* JsxClosingElement */);
+            context.enableEmitNotification(274 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(198 /* PropertyAccessExpression */);
-        context.enableSubstitution(285 /* PropertyAssignment */);
+        context.enableSubstitution(201 /* PropertyAccessExpression */);
+        context.enableSubstitution(288 /* PropertyAssignment */);
         return ts.chainBundle(context, transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -89212,9 +91478,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 272 /* JsxOpeningElement */:
-                case 273 /* JsxClosingElement */:
-                case 271 /* JsxSelfClosingElement */:
+                case 275 /* JsxOpeningElement */:
+                case 276 /* JsxClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -89549,13 +91815,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 232 /* DoStatement */:
+                case 235 /* DoStatement */:
                     return visitDoStatement(node);
-                case 233 /* WhileStatement */:
+                case 236 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -89568,24 +91834,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return visitForStatement(node);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 238 /* BreakStatement */:
+                case 241 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 237 /* ContinueStatement */:
+                case 240 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 262144 /* ContainsYield */) {
@@ -89606,21 +91872,23 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 214 /* ConditionalExpression */:
+                case 337 /* CommaListExpression */:
+                    return visitCommaListExpression(node);
+                case 217 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 216 /* YieldExpression */:
+                case 219 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 199 /* ElementAccessExpression */:
+                case 202 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return visitCallExpression(node);
-                case 201 /* NewExpression */:
+                case 204 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -89633,9 +91901,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 205 /* FunctionExpression */:
+                case 208 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -89843,7 +92111,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 198 /* PropertyAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -89855,7 +92123,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = factory.updatePropertyAccessExpression(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 199 /* ElementAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -89902,6 +92170,61 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        /**
+         * 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 factory.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 */, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
+                        pendingExpressions = [];
+                    }
+                    pendingExpressions.push(ts.visitNode(node, visitor, ts.isExpression));
+                }
+            }
+        }
+        /**
+         * Visits a comma-list expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitCommaListExpression(node) {
+            // flattened version of `visitCommaExpression`
+            var pendingExpressions = [];
+            for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
+                var elem = _a[_i];
+                if (ts.isBinaryExpression(elem) && elem.operatorToken.kind === 27 /* CommaToken */) {
+                    pendingExpressions.push(visitCommaExpression(elem));
+                }
+                else {
+                    if (containsYield(elem) && pendingExpressions.length > 0) {
+                        emitWorker(1 /* Statement */, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
+                        pendingExpressions = [];
+                    }
+                    pendingExpressions.push(ts.visitNode(elem, visitor, ts.isExpression));
+                }
+            }
+            return factory.inlineExpressions(pendingExpressions);
+        }
         /**
          * Visits a logical binary expression containing `yield`.
          *
@@ -89951,38 +92274,6 @@ var ts;
             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 factory.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 */, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]);
-                        pendingExpressions = [];
-                    }
-                    pendingExpressions.push(ts.visitNode(node, visitor, ts.isExpression));
-                }
-            }
-        }
         /**
          * Visits a conditional expression containing `yield`.
          *
@@ -90226,35 +92517,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 227 /* Block */:
+                case 230 /* Block */:
                     return transformAndEmitBlock(node);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 231 /* IfStatement */:
+                case 234 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 232 /* DoStatement */:
+                case 235 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 233 /* WhileStatement */:
+                case 236 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 237 /* ContinueStatement */:
+                case 240 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 238 /* BreakStatement */:
+                case 241 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 239 /* ReturnStatement */:
+                case 242 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 240 /* WithStatement */:
+                case 243 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 243 /* ThrowStatement */:
+                case 246 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 244 /* TryStatement */:
+                case 247 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -90684,7 +92975,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 282 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 285 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -90697,7 +92988,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 281 /* CaseClause */) {
+                        if (clause.kind === 284 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -91858,11 +94149,11 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(213 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(211 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(212 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(286 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(294 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(216 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(214 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(215 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(289 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(297 /* 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.
@@ -91913,7 +94204,10 @@ var ts;
                 ts.append(statements, createUnderscoreUnderscoreESModule());
             }
             if (ts.length(currentModuleInfo.exportedNames)) {
-                ts.append(statements, factory.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames, function (prev, nextId) { return factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.createIdentifier(ts.idText(nextId))), prev); }, factory.createVoidZero())));
+                var chunkSize = 50;
+                for (var i = 0; i < currentModuleInfo.exportedNames.length; i += chunkSize) {
+                    ts.append(statements, factory.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames.slice(i, i + chunkSize), function (prev, nextId) { return factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.createIdentifier(ts.idText(nextId))), prev); }, factory.createVoidZero())));
+                }
             }
             ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement));
             ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
@@ -92187,23 +94481,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 333 /* MergeDeclarationMarker */:
+                case 338 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 334 /* EndOfDeclarationMarker */:
+                case 339 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -92230,24 +94524,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 285 /* PropertyAssignment */:
+                        case 288 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 286 /* ShorthandPropertyAssignment */:
+                        case 289 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 287 /* SpreadAssignment */:
+                        case 290 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 164 /* MethodDeclaration */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
+                        case 165 /* MethodDeclaration */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -92582,9 +94876,11 @@ var ts;
             else if (node.exportClause) {
                 var statements = [];
                 // export * as ns from "mod";
+                // export * as default from "mod";
                 statements.push(ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createExportExpression(factory.cloneNode(node.exportClause.name), getHelperExpressionForExport(node, moduleKind !== ts.ModuleKind.AMD ?
                     createRequireCall(node) :
-                    factory.createIdentifier(ts.idText(node.exportClause.name))))), node), node));
+                    ts.isExportNamespaceAsDefaultDeclaration(node) ? generatedName :
+                        factory.createIdentifier(ts.idText(node.exportClause.name))))), node), node));
                 return ts.singleOrMany(statements);
             }
             else {
@@ -92677,6 +94973,7 @@ var ts;
             var expressions;
             if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                 var modifiers = void 0;
+                var removeCommentsOnExpressions = false;
                 // If we're exporting these variables, then these just become assignments to 'exports.x'.
                 for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                     var variable = _a[_i];
@@ -92687,14 +94984,28 @@ var ts;
                         variables = ts.append(variables, variable);
                     }
                     else if (variable.initializer) {
-                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                        if (!ts.isBindingPattern(variable.name) && (ts.isArrowFunction(variable.initializer) || ts.isFunctionExpression(variable.initializer) || ts.isClassExpression(variable.initializer))) {
+                            var expression = factory.createAssignment(ts.setTextRange(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), variable.name), 
+                            /*location*/ variable.name), factory.createIdentifier(ts.getTextOfIdentifierOrLiteral(variable.name)));
+                            var updatedVariable = factory.createVariableDeclaration(variable.name, variable.exclamationToken, variable.type, ts.visitNode(variable.initializer, moduleExpressionElementVisitor));
+                            variables = ts.append(variables, updatedVariable);
+                            expressions = ts.append(expressions, expression);
+                            removeCommentsOnExpressions = true;
+                        }
+                        else {
+                            expressions = ts.append(expressions, transformInitializedVariable(variable));
+                        }
                     }
                 }
                 if (variables) {
                     statements = ts.append(statements, factory.updateVariableStatement(node, modifiers, factory.updateVariableDeclarationList(node.declarationList, variables)));
                 }
                 if (expressions) {
-                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(expressions)), node), node));
+                    var statement = ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(expressions)), node), node);
+                    if (removeCommentsOnExpressions) {
+                        ts.removeAllComments(statement);
+                    }
+                    statements = ts.append(statements, statement);
                 }
             }
             else {
@@ -92755,7 +95066,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 229 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 232 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -92810,10 +95121,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 260 /* NamespaceImport */:
+                    case 263 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 261 /* NamedImports */:
+                    case 264 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding, /* liveBinding */ true);
@@ -93026,7 +95337,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 294 /* SourceFile */) {
+            if (node.kind === 297 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -93090,10 +95401,10 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 212 /* PostfixUnaryExpression */:
-                case 211 /* PrefixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -93112,9 +95423,9 @@ var ts;
                 }
                 return node;
             }
-            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+            if (!(ts.isGeneratedIdentifier(node) && !(node.autoGenerateFlags & 64 /* AllowNameSubstitution */)) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 294 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 297 /* SourceFile */) {
                     return ts.setTextRange(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.cloneNode(node)), 
                     /*location*/ node);
                 }
@@ -93189,7 +95500,7 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 212 /* PostfixUnaryExpression */
+                    var expression = node.kind === 215 /* PostfixUnaryExpression */
                         ? ts.setTextRange(factory.createBinaryExpression(node.operand, factory.createToken(node.operator === 45 /* PlusPlusToken */ ? 63 /* PlusEqualsToken */ : 64 /* MinusEqualsToken */), factory.createNumericLiteral(1)), 
                         /*location*/ node)
                         : node;
@@ -93241,12 +95552,12 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(286 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(213 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(211 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(212 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(223 /* MetaProperty */); // Substitutes 'import.meta'
-        context.enableEmitNotification(294 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(289 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(216 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(214 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(215 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(226 /* MetaProperty */); // Substitutes 'import.meta'
+        context.enableEmitNotification(297 /* 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.
@@ -93470,7 +95781,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 264 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 267 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -93560,19 +95871,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(factory, entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 258 /* ImportDeclaration */:
+                        case 261 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 257 /* ImportEqualsDeclaration */:
+                        case 260 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(factory.createExpressionStatement(factory.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 264 /* ExportDeclaration */:
+                        case 267 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 if (ts.isNamedExports(entry.exportClause)) {
@@ -93631,13 +95942,13 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -93817,7 +96128,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 === 294 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 297 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -93881,7 +96192,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 === 229 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 232 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasSyntacticModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -93943,10 +96254,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 260 /* NamespaceImport */:
+                    case 263 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 261 /* NamedImports */:
+                    case 264 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -94126,43 +96437,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 234 /* ForStatement */:
+                case 237 /* ForStatement */:
                     return visitForStatement(node);
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 236 /* ForOfStatement */:
+                case 239 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 232 /* DoStatement */:
+                case 235 /* DoStatement */:
                     return visitDoStatement(node);
-                case 233 /* WhileStatement */:
+                case 236 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 242 /* LabeledStatement */:
+                case 245 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 240 /* WithStatement */:
+                case 243 /* WithStatement */:
                     return visitWithStatement(node);
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 255 /* CaseBlock */:
+                case 258 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 281 /* CaseClause */:
+                case 284 /* CaseClause */:
                     return visitCaseClause(node);
-                case 282 /* DefaultClause */:
+                case 285 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 244 /* TryStatement */:
+                case 247 /* TryStatement */:
                     return visitTryStatement(node);
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return visitCatchClause(node);
-                case 227 /* Block */:
+                case 230 /* Block */:
                     return visitBlock(node);
-                case 333 /* MergeDeclarationMarker */:
+                case 338 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 334 /* EndOfDeclarationMarker */:
+                case 339 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -94409,7 +96720,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 294 /* SourceFile */;
+                return container !== undefined && container.kind === 297 /* SourceFile */;
             }
             else {
                 return false;
@@ -94442,7 +96753,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 294 /* SourceFile */) {
+            if (node.kind === 297 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -94492,7 +96803,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -94528,12 +96839,12 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 211 /* PrefixUnaryExpression */:
-                case 212 /* PostfixUnaryExpression */:
+                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
-                case 223 /* MetaProperty */:
+                case 226 /* MetaProperty */:
                     return substituteMetaProperty(node);
             }
             return node;
@@ -94626,14 +96937,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 212 /* PostfixUnaryExpression */
+                    var expression = node.kind === 215 /* PostfixUnaryExpression */
                         ? ts.setTextRange(factory.createPrefixUnaryExpression(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 === 212 /* PostfixUnaryExpression */) {
+                    if (node.kind === 215 /* PostfixUnaryExpression */) {
                         expression = node.operator === 45 /* PlusPlusToken */
                             ? factory.createSubtract(preventSubstitution(expression), factory.createNumericLiteral(1))
                             : factory.createAdd(preventSubstitution(expression), factory.createNumericLiteral(1));
@@ -94661,7 +96972,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 294 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 297 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, factory.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -94701,7 +97012,7 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(294 /* SourceFile */);
+        context.enableEmitNotification(297 /* SourceFile */);
         context.enableSubstitution(78 /* Identifier */);
         var helperNameSubstitutions;
         return ts.chainBundle(context, transformSourceFile);
@@ -94733,12 +97044,12 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 264 /* ExportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     var exportDecl = node;
                     return visitExportDeclaration(exportDecl);
             }
@@ -94765,7 +97076,7 @@ var ts;
             /*isTypeOnly*/ false, 
             /*name*/ undefined, factory.createNamespaceImport(synthName)), node.moduleSpecifier);
             ts.setOriginalNode(importDecl, node.exportClause);
-            var exportDecl = factory.createExportDeclaration(
+            var exportDecl = ts.isExportNamespaceAsDefaultDeclaration(node) ? factory.createExportDefault(synthName) : factory.createExportDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*isTypeOnly*/ false, factory.createNamedExports([factory.createExportSpecifier(synthName, oldIdentifier)]));
@@ -94872,7 +97183,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 === 249 /* ClassDeclaration */) {
+            else if (node.parent.kind === 252 /* 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 :
@@ -94901,7 +97212,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 === 249 /* ClassDeclaration */) {
+            else if (node.parent.kind === 252 /* 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 :
@@ -94948,7 +97259,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 === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) {
+            if (node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* 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 :
@@ -94957,8 +97268,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 === 162 /* PropertyDeclaration */ || node.kind === 198 /* PropertyAccessExpression */ || node.kind === 161 /* PropertySignature */ ||
-                (node.kind === 159 /* Parameter */ && ts.hasSyntacticModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 163 /* PropertyDeclaration */ || node.kind === 201 /* PropertyAccessExpression */ || node.kind === 162 /* PropertySignature */ ||
+                (node.kind === 160 /* Parameter */ && ts.hasSyntacticModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasSyntacticModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -94967,7 +97278,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 === 249 /* ClassDeclaration */ || node.kind === 159 /* Parameter */) {
+                else if (node.parent.kind === 252 /* ClassDeclaration */ || node.kind === 160 /* 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 :
@@ -94992,7 +97303,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 167 /* SetAccessor */) {
+            if (node.kind === 168 /* 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.hasSyntacticModifier(node, 32 /* Static */)) {
@@ -95031,26 +97342,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 169 /* ConstructSignature */:
+                case 170 /* 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 168 /* CallSignature */:
+                case 169 /* 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 170 /* IndexSignature */:
+                case 171 /* 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 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     if (ts.hasSyntacticModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -95058,7 +97369,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 === 249 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 252 /* 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 :
@@ -95072,7 +97383,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 248 /* FunctionDeclaration */:
+                case 251 /* 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 :
@@ -95097,30 +97408,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 165 /* Constructor */:
+                case 166 /* 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 169 /* ConstructSignature */:
-                case 174 /* ConstructorType */:
+                case 170 /* ConstructSignature */:
+                case 175 /* 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 168 /* CallSignature */:
+                case 169 /* 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 170 /* IndexSignature */:
+                case 171 /* 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 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     if (ts.hasSyntacticModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -95128,7 +97439,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 === 249 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 252 /* 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 :
@@ -95141,15 +97452,15 @@ 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 248 /* FunctionDeclaration */:
-                case 173 /* FunctionType */:
+                case 251 /* FunctionDeclaration */:
+                case 174 /* 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;
-                case 167 /* SetAccessor */:
-                case 166 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 167 /* GetAccessor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -95163,39 +97474,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 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 189 /* MappedType */:
+                case 190 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 174 /* ConstructorType */:
-                case 169 /* ConstructSignature */:
+                case 175 /* ConstructorType */:
+                case 170 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 168 /* CallSignature */:
+                case 169 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                     if (ts.hasSyntacticModifier(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 === 249 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 252 /* 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 173 /* FunctionType */:
-                case 248 /* FunctionDeclaration */:
+                case 174 /* FunctionType */:
+                case 251 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -95259,7 +97570,7 @@ var ts;
     }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
-        if (parseTreeNode && parseTreeNode.kind === 159 /* Parameter */) {
+        if (parseTreeNode && parseTreeNode.kind === 160 /* Parameter */) {
             var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
             var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
             var text = currentSourceFile.text;
@@ -95314,6 +97625,7 @@ var ts;
             reportCyclicStructureError: reportCyclicStructureError,
             reportPrivateInBaseOfClassExpression: reportPrivateInBaseOfClassExpression,
             reportLikelyUnsafeImportRequiredError: reportLikelyUnsafeImportRequiredError,
+            reportTruncationError: reportTruncationError,
             moduleResolverHost: host,
             trackReferencedAmbientModule: trackReferencedAmbientModule,
             trackExternalModuleSymbolOfImportTypeNode: trackExternalModuleSymbolOfImportTypeNode,
@@ -95413,6 +97725,11 @@ var ts;
                 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 reportTruncationError() {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_this_node_exceeds_the_maximum_length_the_compiler_will_serialize_An_explicit_type_annotation_is_needed));
+            }
+        }
         function reportNonlocalAugmentation(containingFile, parentSymbol, symbol) {
             var primaryDeclaration = ts.find(parentSymbol.declarations, function (d) { return ts.getSourceFileOfNode(d) === containingFile; });
             var augmentingDeclarations = ts.filter(symbol.declarations, function (d) { return ts.getSourceFileOfNode(d) !== containingFile; });
@@ -95434,10 +97751,10 @@ var ts;
             return result;
         }
         function transformRoot(node) {
-            if (node.kind === 294 /* SourceFile */ && node.isDeclarationFile) {
+            if (node.kind === 297 /* SourceFile */ && node.isDeclarationFile) {
                 return node;
             }
-            if (node.kind === 295 /* Bundle */) {
+            if (node.kind === 298 /* Bundle */) {
                 isBundledEmit = true;
                 refs = new ts.Map();
                 libs = new ts.Map();
@@ -95467,7 +97784,7 @@ var ts;
                     var updated = ts.isSourceFileJS(sourceFile) ? factory.createNodeArray(transformDeclarationsForJS(sourceFile)) : ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return factory.updateSourceFile(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 297 /* InputFiles */) {
+                    if (prepend.kind === 300 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -95608,7 +97925,7 @@ var ts;
                 return name;
             }
             else {
-                if (name.kind === 194 /* ArrayBindingPattern */) {
+                if (name.kind === 197 /* ArrayBindingPattern */) {
                     return factory.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -95616,7 +97933,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 219 /* OmittedExpression */) {
+                if (elem.kind === 222 /* OmittedExpression */) {
                     return elem;
                 }
                 return factory.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -95654,7 +97971,7 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 159 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 160 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
@@ -95663,7 +97980,7 @@ var ts;
             if (!ts.getParseTreeNode(node)) {
                 return type ? ts.visitNode(type, visitDeclarationSubtree) : factory.createKeywordTypeNode(128 /* AnyKeyword */);
             }
-            if (node.kind === 167 /* SetAccessor */) {
+            if (node.kind === 168 /* 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 factory.createKeywordTypeNode(128 /* AnyKeyword */);
@@ -95674,12 +97991,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) {
+            if (node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 159 /* Parameter */
-                || node.kind === 162 /* PropertyDeclaration */
-                || node.kind === 161 /* PropertySignature */) {
+            if (node.kind === 160 /* Parameter */
+                || node.kind === 163 /* PropertyDeclaration */
+                || node.kind === 162 /* 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));
@@ -95696,20 +98013,20 @@ var ts;
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 252 /* EnumDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 257 /* ImportEqualsDeclaration */:
-                case 258 /* ImportDeclaration */:
-                case 264 /* ExportDeclaration */:
-                case 263 /* ExportAssignment */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportDeclaration */:
+                case 267 /* ExportDeclaration */:
+                case 266 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -95790,7 +98107,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 253 /* ModuleDeclaration */ && parent.kind !== 192 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 256 /* ModuleDeclaration */ && parent.kind !== 195 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -95810,7 +98127,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 269 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 272 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return factory.updateImportEqualsDeclaration(decl, 
@@ -95837,7 +98154,7 @@ var ts;
                 return visibleDefaultBinding && factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 260 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 263 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -95932,7 +98249,7 @@ var ts;
             // We'd see a TDZ violation at runtime
             var canProduceDiagnostic = ts.canProduceDiagnostics(input);
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 176 /* TypeLiteral */ || input.kind === 189 /* MappedType */) && input.parent.kind !== 251 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 177 /* TypeLiteral */ || input.kind === 190 /* MappedType */) && input.parent.kind !== 254 /* TypeAliasDeclaration */);
             // Emit methods which are private as properties with no type information
             if (ts.isMethodDeclaration(input) || ts.isMethodSignature(input)) {
                 if (ts.hasEffectiveModifier(input, 8 /* Private */)) {
@@ -95953,21 +98270,21 @@ var ts;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 220 /* ExpressionWithTypeArguments */: {
+                    case 223 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(factory.updateExpressionWithTypeArguments(node, node.expression, node.typeArguments));
                     }
-                    case 172 /* TypeReference */: {
+                    case 173 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(factory.updateTypeReferenceNode(node, node.typeName, node.typeArguments));
                     }
-                    case 169 /* ConstructSignature */:
+                    case 170 /* ConstructSignature */:
                         return cleanup(factory.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 165 /* Constructor */: {
+                    case 166 /* Constructor */: {
                         // A constructor declaration may not have a type annotation
                         var ctor = factory.createConstructorDeclaration(
                         /*decorators*/ undefined, 
@@ -95975,7 +98292,7 @@ var ts;
                         /*body*/ undefined);
                         return cleanup(ctor);
                     }
-                    case 164 /* MethodDeclaration */: {
+                    case 165 /* MethodDeclaration */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -95985,7 +98302,7 @@ var ts;
                         /*body*/ undefined);
                         return cleanup(sig);
                     }
-                    case 166 /* GetAccessor */: {
+                    case 167 /* GetAccessor */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -95994,7 +98311,7 @@ var ts;
                         /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), ensureType(input, accessorType), 
                         /*body*/ undefined));
                     }
-                    case 167 /* SetAccessor */: {
+                    case 168 /* SetAccessor */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -96002,31 +98319,31 @@ var ts;
                         /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), 
                         /*body*/ undefined));
                     }
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
                         return cleanup(factory.updatePropertyDeclaration(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, ensureType(input, input.type), ensureNoInitializer(input)));
-                    case 161 /* PropertySignature */:
+                    case 162 /* PropertySignature */:
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
                         return cleanup(factory.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, ensureType(input, input.type)));
-                    case 163 /* MethodSignature */: {
+                    case 164 /* MethodSignature */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
                         return cleanup(factory.updateMethodSignature(input, ensureModifiers(input), input.name, input.questionToken, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 168 /* CallSignature */: {
+                    case 169 /* CallSignature */: {
                         return cleanup(factory.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 170 /* IndexSignature */: {
+                    case 171 /* IndexSignature */: {
                         return cleanup(factory.updateIndexSignature(input, 
                         /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || factory.createKeywordTypeNode(128 /* AnyKeyword */)));
                     }
-                    case 246 /* VariableDeclaration */: {
+                    case 249 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -96034,13 +98351,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(factory.updateVariableDeclaration(input, input.name, /*exclamationToken*/ undefined, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 158 /* TypeParameter */: {
+                    case 159 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(factory.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 183 /* ConditionalType */: {
+                    case 184 /* 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);
@@ -96052,13 +98369,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(factory.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 173 /* FunctionType */: {
+                    case 174 /* FunctionType */: {
                         return cleanup(factory.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 174 /* ConstructorType */: {
+                    case 175 /* ConstructorType */: {
                         return cleanup(factory.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 192 /* ImportType */: {
+                    case 195 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -96090,7 +98407,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 164 /* MethodDeclaration */ && ts.hasEffectiveModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 165 /* MethodDeclaration */ && ts.hasEffectiveModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -96100,7 +98417,7 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 264 /* ExportDeclaration */: {
+                case 267 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
                     }
@@ -96110,7 +98427,7 @@ var ts;
                     return factory.updateExportDeclaration(input, 
                     /*decorators*/ undefined, input.modifiers, input.isTypeOnly, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 263 /* ExportAssignment */: {
+                case 266 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
@@ -96149,10 +98466,10 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 257 /* ImportEqualsDeclaration */: {
+                case 260 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 258 /* ImportDeclaration */: {
+                case 261 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -96173,14 +98490,14 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 251 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 254 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(factory.updateTypeAliasDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 250 /* InterfaceDeclaration */: {
+                case 253 /* InterfaceDeclaration */: {
                     return cleanup(factory.updateInterfaceDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 248 /* FunctionDeclaration */: {
+                case 251 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(factory.updateFunctionDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input), 
@@ -96247,10 +98564,10 @@ var ts;
                         return clean;
                     }
                 }
-                case 253 /* ModuleDeclaration */: {
+                case 256 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 254 /* ModuleBlock */) {
+                    if (inner && inner.kind === 257 /* ModuleBlock */) {
                         var oldNeedsScopeFix = needsScopeFixMarker;
                         var oldHasScopeFix = resultHasScopeMarker;
                         resultHasScopeMarker = false;
@@ -96293,7 +98610,7 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 249 /* ClassDeclaration */: {
+                case 252 /* ClassDeclaration */: {
                     var modifiers = factory.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
@@ -96374,10 +98691,10 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 229 /* VariableStatement */: {
+                case 232 /* VariableStatement */: {
                     return cleanup(transformVariableStatement(input));
                 }
-                case 252 /* EnumDeclaration */: {
+                case 255 /* EnumDeclaration */: {
                     return cleanup(factory.updateEnumDeclaration(input, /*decorators*/ undefined, factory.createNodeArray(ensureModifiers(input)), input.name, factory.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
@@ -96396,7 +98713,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 253 /* ModuleDeclaration */) {
+                if (input.kind === 256 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -96417,7 +98734,7 @@ var ts;
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 219 /* OmittedExpression */) {
+            if (e.kind === 222 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -96467,7 +98784,7 @@ var ts;
         function ensureModifierFlags(node) {
             var mask = 11263 /* 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 === 294 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 297 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
                 mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
@@ -96496,7 +98813,7 @@ var ts;
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 250 /* InterfaceDeclaration */) {
+        if (node.kind === 253 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -96521,7 +98838,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 166 /* GetAccessor */
+            return accessor.kind === 167 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -96530,52 +98847,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
                 return !ts.hasEffectiveModifier(node, 8 /* Private */);
-            case 159 /* Parameter */:
-            case 246 /* VariableDeclaration */:
+            case 160 /* Parameter */:
+            case 249 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 248 /* FunctionDeclaration */:
-            case 253 /* ModuleDeclaration */:
-            case 257 /* ImportEqualsDeclaration */:
-            case 250 /* InterfaceDeclaration */:
-            case 249 /* ClassDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
-            case 252 /* EnumDeclaration */:
-            case 229 /* VariableStatement */:
-            case 258 /* ImportDeclaration */:
-            case 264 /* ExportDeclaration */:
-            case 263 /* ExportAssignment */:
+            case 251 /* FunctionDeclaration */:
+            case 256 /* ModuleDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 252 /* ClassDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
+            case 255 /* EnumDeclaration */:
+            case 232 /* VariableStatement */:
+            case 261 /* ImportDeclaration */:
+            case 267 /* ExportDeclaration */:
+            case 266 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 169 /* ConstructSignature */:
-            case 165 /* Constructor */:
-            case 164 /* MethodDeclaration */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 163 /* MethodSignature */:
-            case 168 /* CallSignature */:
-            case 170 /* IndexSignature */:
-            case 246 /* VariableDeclaration */:
-            case 158 /* TypeParameter */:
-            case 220 /* ExpressionWithTypeArguments */:
-            case 172 /* TypeReference */:
-            case 183 /* ConditionalType */:
-            case 173 /* FunctionType */:
-            case 174 /* ConstructorType */:
-            case 192 /* ImportType */:
+            case 170 /* ConstructSignature */:
+            case 166 /* Constructor */:
+            case 165 /* MethodDeclaration */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 164 /* MethodSignature */:
+            case 169 /* CallSignature */:
+            case 171 /* IndexSignature */:
+            case 249 /* VariableDeclaration */:
+            case 159 /* TypeParameter */:
+            case 223 /* ExpressionWithTypeArguments */:
+            case 173 /* TypeReference */:
+            case 184 /* ConditionalType */:
+            case 174 /* FunctionType */:
+            case 175 /* ConstructorType */:
+            case 195 /* ImportType */:
                 return true;
         }
         return false;
@@ -96619,14 +98936,13 @@ var ts;
     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 && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
         transformers.push(ts.transformClassFields);
-        if (jsx === 2 /* React */) {
+        if (ts.getJSXTransformEnabled(compilerOptions)) {
             transformers.push(ts.transformJsx);
         }
         if (languageVersion < 99 /* ESNext */) {
@@ -96708,7 +99024,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, factory, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(336 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(341 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentStatements;
@@ -96781,7 +99097,13 @@ var ts;
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
-        var transformed = ts.map(nodes, allowDtsFiles ? transformation : transformRoot);
+        var transformed = [];
+        for (var _a = 0, nodes_3 = nodes; _a < nodes_3.length; _a++) {
+            var node = nodes_3[_a];
+            ts.tracing.push("emit" /* Emit */, "transformNodes", node.kind === 297 /* SourceFile */ ? { path: node.path } : { kind: node.kind, pos: node.pos, end: node.end });
+            transformed.push((allowDtsFiles ? transformation : transformRoot)(node));
+            ts.tracing.pop();
+        }
         // prevent modification of the lexical environment.
         state = 2 /* Completed */;
         ts.performance.mark("afterTransform");
@@ -97017,8 +99339,8 @@ var ts;
         function dispose() {
             if (state < 3 /* Disposed */) {
                 // Clean up emit nodes on parse tree
-                for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
-                    var node = nodes_3[_i];
+                for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
+                    var node = nodes_4[_i];
                     ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node)));
                 }
                 // Release references to external entries for GC purposes.
@@ -97150,7 +99472,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 295 /* Bundle */) {
+        if (sourceFile.kind === 298 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -97346,9 +99668,15 @@ var ts;
                     sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
+            ts.tracing.push("emit" /* Emit */, "emitJsFileOrBundle", { jsFilePath: jsFilePath });
             emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            ts.tracing.pop();
+            ts.tracing.push("emit" /* Emit */, "emitDeclarationFileOrBundle", { declarationFilePath: declarationFilePath });
             emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
+            ts.tracing.pop();
+            ts.tracing.push("emit" /* Emit */, "emitBuildInfo", { buildInfoPath: buildInfoPath });
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
+            ts.tracing.pop();
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
                     if (jsFilePath) {
@@ -97480,7 +99808,7 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (forceDtsEmit && declarationTransform.transformed[0].kind === 294 /* SourceFile */) {
+                if (forceDtsEmit && declarationTransform.transformed[0].kind === 297 /* SourceFile */) {
                     var sourceFile = declarationTransform.transformed[0];
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
@@ -97503,8 +99831,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 295 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 294 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 298 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 297 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -97545,7 +99873,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 294 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 297 /* 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
@@ -97589,16 +99917,16 @@ var ts;
                 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
+                    return encodeURI(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);
+                    /*isAbsolutePathAnUrl*/ true));
                 }
                 else {
-                    return ts.combinePaths(sourceMapDir, sourceMapFile);
+                    return encodeURI(ts.combinePaths(sourceMapDir, sourceMapFile));
                 }
             }
-            return sourceMapFile;
+            return encodeURI(sourceMapFile);
         }
     }
     ts.emitFiles = emitFiles;
@@ -97813,6 +100141,8 @@ var ts;
         var sourceMapGenerator;
         var sourceMapSource;
         var sourceMapSourceIndex = -1;
+        var mostRecentlyAddedSourceMapSource;
+        var mostRecentlyAddedSourceMapSourceIndex = -1;
         // Comments
         var containerPos = -1;
         var containerEnd = -1;
@@ -97851,9 +100181,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 294 /* SourceFile */: return printFile(node);
-                case 295 /* Bundle */: return printBundle(node);
-                case 296 /* UnparsedSource */: return printUnparsedSource(node);
+                case 297 /* SourceFile */: return printFile(node);
+                case 298 /* Bundle */: return printBundle(node);
+                case 299 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -98109,12 +100439,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 294 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 297 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 294 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 297 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -98156,15 +100486,15 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node, /*jsxAttributeEscape*/ false);
-                    case 296 /* UnparsedSource */:
-                    case 290 /* UnparsedPrepend */:
+                    case 299 /* UnparsedSource */:
+                    case 293 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 289 /* UnparsedPrologue */:
+                    case 292 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 291 /* UnparsedText */:
-                    case 292 /* UnparsedInternalText */:
+                    case 294 /* UnparsedText */:
+                    case 295 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 293 /* UnparsedSyntheticReference */:
+                    case 296 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
                     case 78 /* Identifier */:
@@ -98174,262 +100504,270 @@ var ts;
                         return emitPrivateIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 156 /* QualifiedName */:
+                    case 157 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 157 /* ComputedPropertyName */:
+                    case 158 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 158 /* TypeParameter */:
+                    case 159 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 159 /* Parameter */:
+                    case 160 /* Parameter */:
                         return emitParameter(node);
-                    case 160 /* Decorator */:
+                    case 161 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 161 /* PropertySignature */:
+                    case 162 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 163 /* MethodSignature */:
+                    case 164 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         return emitConstructor(node);
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 168 /* CallSignature */:
+                    case 169 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 169 /* ConstructSignature */:
+                    case 170 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 170 /* IndexSignature */:
+                    case 171 /* IndexSignature */:
                         return emitIndexSignature(node);
+                    case 194 /* TemplateLiteralTypeSpan */:
+                        return emitTemplateTypeSpan(node);
                     // Types
-                    case 171 /* TypePredicate */:
+                    case 172 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 172 /* TypeReference */:
+                    case 173 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 173 /* FunctionType */:
+                    case 174 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 304 /* JSDocFunctionType */:
+                    case 308 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 174 /* ConstructorType */:
+                    case 175 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 175 /* TypeQuery */:
+                    case 176 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 176 /* TypeLiteral */:
+                    case 177 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 177 /* ArrayType */:
+                    case 178 /* ArrayType */:
                         return emitArrayType(node);
-                    case 178 /* TupleType */:
+                    case 179 /* TupleType */:
                         return emitTupleType(node);
-                    case 179 /* OptionalType */:
+                    case 180 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 181 /* UnionType */:
+                    case 182 /* UnionType */:
                         return emitUnionType(node);
-                    case 182 /* IntersectionType */:
+                    case 183 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 183 /* ConditionalType */:
+                    case 184 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 184 /* InferType */:
+                    case 185 /* InferType */:
                         return emitInferType(node);
-                    case 185 /* ParenthesizedType */:
+                    case 186 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 220 /* ExpressionWithTypeArguments */:
+                    case 223 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 186 /* ThisType */:
+                    case 187 /* ThisType */:
                         return emitThisType();
-                    case 187 /* TypeOperator */:
+                    case 188 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 188 /* IndexedAccessType */:
+                    case 189 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 189 /* MappedType */:
+                    case 190 /* MappedType */:
                         return emitMappedType(node);
-                    case 190 /* LiteralType */:
+                    case 191 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 192 /* ImportType */:
+                    case 193 /* TemplateLiteralType */:
+                        return emitTemplateType(node);
+                    case 195 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 299 /* JSDocAllType */:
+                    case 303 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 300 /* JSDocUnknownType */:
+                    case 304 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 301 /* JSDocNullableType */:
+                    case 305 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 302 /* JSDocNonNullableType */:
+                    case 306 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 303 /* JSDocOptionalType */:
+                    case 307 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 180 /* RestType */:
-                    case 305 /* JSDocVariadicType */:
+                    case 181 /* RestType */:
+                    case 309 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
-                    case 191 /* NamedTupleMember */:
+                    case 192 /* NamedTupleMember */:
                         return emitNamedTupleMember(node);
                     // Binding patterns
-                    case 193 /* ObjectBindingPattern */:
+                    case 196 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 194 /* ArrayBindingPattern */:
+                    case 197 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 195 /* BindingElement */:
+                    case 198 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 225 /* TemplateSpan */:
+                    case 228 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 226 /* SemicolonClassElement */:
+                    case 229 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 227 /* Block */:
+                    case 230 /* Block */:
                         return emitBlock(node);
-                    case 229 /* VariableStatement */:
+                    case 232 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 228 /* EmptyStatement */:
+                    case 231 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 230 /* ExpressionStatement */:
+                    case 233 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 231 /* IfStatement */:
+                    case 234 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 232 /* DoStatement */:
+                    case 235 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 233 /* WhileStatement */:
+                    case 236 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 234 /* ForStatement */:
+                    case 237 /* ForStatement */:
                         return emitForStatement(node);
-                    case 235 /* ForInStatement */:
+                    case 238 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 236 /* ForOfStatement */:
+                    case 239 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 237 /* ContinueStatement */:
+                    case 240 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 238 /* BreakStatement */:
+                    case 241 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 239 /* ReturnStatement */:
+                    case 242 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 240 /* WithStatement */:
+                    case 243 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 241 /* SwitchStatement */:
+                    case 244 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 242 /* LabeledStatement */:
+                    case 245 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 243 /* ThrowStatement */:
+                    case 246 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 244 /* TryStatement */:
+                    case 247 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 245 /* DebuggerStatement */:
+                    case 248 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 246 /* VariableDeclaration */:
+                    case 249 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 247 /* VariableDeclarationList */:
+                    case 250 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 248 /* FunctionDeclaration */:
+                    case 251 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 249 /* ClassDeclaration */:
+                    case 252 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 250 /* InterfaceDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 251 /* TypeAliasDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 252 /* EnumDeclaration */:
+                    case 255 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 253 /* ModuleDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 254 /* ModuleBlock */:
+                    case 257 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 255 /* CaseBlock */:
+                    case 258 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 256 /* NamespaceExportDeclaration */:
+                    case 259 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 257 /* ImportEqualsDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 258 /* ImportDeclaration */:
+                    case 261 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 259 /* ImportClause */:
+                    case 262 /* ImportClause */:
                         return emitImportClause(node);
-                    case 260 /* NamespaceImport */:
+                    case 263 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 266 /* NamespaceExport */:
+                    case 269 /* NamespaceExport */:
                         return emitNamespaceExport(node);
-                    case 261 /* NamedImports */:
+                    case 264 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 262 /* ImportSpecifier */:
+                    case 265 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 263 /* ExportAssignment */:
+                    case 266 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 264 /* ExportDeclaration */:
+                    case 267 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 265 /* NamedExports */:
+                    case 268 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 267 /* ExportSpecifier */:
+                    case 270 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 268 /* MissingDeclaration */:
+                    case 271 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 269 /* ExternalModuleReference */:
+                    case 272 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 272 /* JsxOpeningElement */:
-                    case 275 /* JsxOpeningFragment */:
+                    case 275 /* JsxOpeningElement */:
+                    case 278 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 273 /* JsxClosingElement */:
-                    case 276 /* JsxClosingFragment */:
+                    case 276 /* JsxClosingElement */:
+                    case 279 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 277 /* JsxAttribute */:
+                    case 280 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 278 /* JsxAttributes */:
+                    case 281 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 279 /* JsxSpreadAttribute */:
+                    case 282 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 280 /* JsxExpression */:
+                    case 283 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 281 /* CaseClause */:
+                    case 284 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 282 /* DefaultClause */:
+                    case 285 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 283 /* HeritageClause */:
+                    case 286 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 284 /* CatchClause */:
+                    case 287 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 285 /* PropertyAssignment */:
+                    case 288 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 286 /* ShorthandPropertyAssignment */:
+                    case 289 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 287 /* SpreadAssignment */:
+                    case 290 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 288 /* EnumMember */:
+                    case 291 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 322 /* JSDocParameterTag */:
-                    case 328 /* JSDocPropertyTag */:
+                    case 326 /* JSDocParameterTag */:
+                    case 333 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 323 /* JSDocReturnTag */:
-                    case 325 /* JSDocTypeTag */:
-                    case 324 /* JSDocThisTag */:
-                    case 321 /* JSDocEnumTag */:
+                    case 327 /* JSDocReturnTag */:
+                    case 329 /* JSDocTypeTag */:
+                    case 328 /* JSDocThisTag */:
+                    case 325 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 312 /* JSDocImplementsTag */:
-                    case 311 /* JSDocAugmentsTag */:
+                    case 316 /* JSDocImplementsTag */:
+                    case 315 /* JSDocAugmentsTag */:
                         return emitJSDocHeritageTag(node);
-                    case 326 /* JSDocTemplateTag */:
+                    case 330 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 327 /* JSDocTypedefTag */:
+                    case 331 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 320 /* JSDocCallbackTag */:
+                    case 324 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 309 /* JSDocSignature */:
+                    case 313 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 308 /* JSDocTypeLiteral */:
+                    case 312 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 315 /* JSDocClassTag */:
-                    case 310 /* JSDocTag */:
+                    case 319 /* JSDocClassTag */:
+                    case 314 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 307 /* JSDocComment */:
+                    case 332 /* JSDocSeeTag */:
+                        return emitJSDocSeeTag(node);
+                    case 302 /* JSDocNameReference */:
+                        return emitJSDocNameReference(node);
+                    case 311 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -98466,71 +100804,71 @@ var ts;
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 196 /* ArrayLiteralExpression */:
+                    case 199 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 197 /* ObjectLiteralExpression */:
+                    case 200 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 198 /* PropertyAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 199 /* ElementAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 200 /* CallExpression */:
+                    case 203 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 201 /* NewExpression */:
+                    case 204 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 202 /* TaggedTemplateExpression */:
+                    case 205 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 203 /* TypeAssertionExpression */:
+                    case 206 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 204 /* ParenthesizedExpression */:
+                    case 207 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 205 /* FunctionExpression */:
+                    case 208 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 206 /* ArrowFunction */:
+                    case 209 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 207 /* DeleteExpression */:
+                    case 210 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 208 /* TypeOfExpression */:
+                    case 211 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 209 /* VoidExpression */:
+                    case 212 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 210 /* AwaitExpression */:
+                    case 213 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 211 /* PrefixUnaryExpression */:
+                    case 214 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 212 /* PostfixUnaryExpression */:
+                    case 215 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 213 /* BinaryExpression */:
+                    case 216 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 214 /* ConditionalExpression */:
+                    case 217 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 215 /* TemplateExpression */:
+                    case 218 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 216 /* YieldExpression */:
+                    case 219 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 217 /* SpreadElement */:
+                    case 220 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 218 /* ClassExpression */:
+                    case 221 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 219 /* OmittedExpression */:
+                    case 222 /* OmittedExpression */:
                         return;
-                    case 221 /* AsExpression */:
+                    case 224 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 222 /* NonNullExpression */:
+                    case 225 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 223 /* MetaProperty */:
+                    case 226 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 270 /* JsxElement */:
+                    case 273 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 271 /* JsxSelfClosingElement */:
+                    case 274 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 274 /* JsxFragment */:
+                    case 277 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 331 /* PartiallyEmittedExpression */:
+                    case 336 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 332 /* CommaListExpression */:
+                    case 337 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -98572,7 +100910,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 295 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 298 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -98672,7 +101010,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 291 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 294 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -98745,7 +101083,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 304 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 308 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -98807,7 +101145,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 166 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 167 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -98841,6 +101179,10 @@ var ts;
             emitTypeAnnotation(node.type);
             writeTrailingSemicolon();
         }
+        function emitTemplateTypeSpan(node) {
+            emit(node.type);
+            emit(node.literal);
+        }
         function emitSemicolonClassElement() {
             writeTrailingSemicolon();
         }
@@ -98999,13 +101341,19 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 141 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 142 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
             }
             writePunctuation("[");
             pipelineEmit(3 /* MappedTypeParameter */, node.typeParameter);
+            if (node.nameType) {
+                writeSpace();
+                writeKeyword("as");
+                writeSpace();
+                emit(node.nameType);
+            }
             writePunctuation("]");
             if (node.questionToken) {
                 emit(node.questionToken);
@@ -99029,6 +101377,10 @@ var ts;
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
+        function emitTemplateType(node) {
+            emit(node.head);
+            emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
+        }
         function emitImportTypeNode(node) {
             if (node.isTypeOf) {
                 writeKeyword("typeof");
@@ -99227,7 +101579,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 === 211 /* PrefixUnaryExpression */
+            return operand.kind === 214 /* PrefixUnaryExpression */
                 && ((node.operator === 39 /* PlusToken */ && (operand.operator === 39 /* PlusToken */ || operand.operator === 45 /* PlusPlusToken */))
                     || (node.operator === 40 /* MinusToken */ && (operand.operator === 40 /* MinusToken */ || operand.operator === 46 /* MinusMinusToken */)));
         }
@@ -99415,7 +101767,7 @@ var ts;
             if (node.elseStatement) {
                 writeLineOrSpace(node, node.thenStatement, node.elseStatement);
                 emitTokenWithComment(90 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 231 /* IfStatement */) {
+                if (node.elseStatement.kind === 234 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -99478,7 +101830,7 @@ var ts;
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(155 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(156 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -99486,7 +101838,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 247 /* VariableDeclarationList */) {
+                if (node.kind === 250 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -99782,7 +102134,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 253 /* ModuleDeclaration */) {
+            while (body.kind === 256 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -99827,7 +102179,7 @@ var ts;
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(152 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(153 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -99835,7 +102187,7 @@ var ts;
         }
         function emitImportClause(node) {
             if (node.isTypeOnly) {
-                emitTokenWithComment(148 /* TypeKeyword */, node.pos, writeKeyword, node);
+                emitTokenWithComment(149 /* TypeKeyword */, node.pos, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -99875,7 +102227,7 @@ var ts;
             var nextPos = emitTokenWithComment(92 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
-                nextPos = emitTokenWithComment(148 /* TypeKeyword */, nextPos, writeKeyword, node);
+                nextPos = emitTokenWithComment(149 /* TypeKeyword */, nextPos, writeKeyword, node);
                 writeSpace();
             }
             if (node.exportClause) {
@@ -99887,7 +102239,7 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(152 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(153 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
@@ -99898,7 +102250,7 @@ var ts;
             writeSpace();
             nextPos = emitTokenWithComment(126 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(139 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(140 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -100121,7 +102473,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 325 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 329 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -100137,6 +102489,17 @@ var ts;
             emitJSDocTypeExpression(tag.typeExpression);
             emitJSDocComment(tag.comment);
         }
+        function emitJSDocSeeTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            emit(tag.name);
+            emitJSDocComment(tag.comment);
+        }
+        function emitJSDocNameReference(node) {
+            writeSpace();
+            writePunctuation("{");
+            emit(node.name);
+            writePunctuation("}");
+        }
         function emitJSDocHeritageTag(tag) {
             emitJSDocTagName(tag.tagName);
             writeSpace();
@@ -100155,7 +102518,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 298 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 301 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -100174,7 +102537,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 308 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 312 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -100308,8 +102671,8 @@ var ts;
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
                 writeLine();
             }
-            for (var _d = 0, types_22 = types; _d < types_22.length; _d++) {
-                var directive = types_22[_d];
+            for (var _d = 0, types_23 = types; _d < types_23.length; _d++) {
+                var directive = types_23[_d];
                 var pos = writer.getTextPos();
                 writeComment("/// <reference types=\"" + directive.fileName + "\" />");
                 if (bundleFileInfo)
@@ -101038,7 +103401,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 204 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 207 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -101071,7 +103434,10 @@ var ts;
                     return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
                 }
             }
-            return ts.getLiteralText(node, currentSourceFile, neverAsciiEscape, jsxAttributeEscape);
+            var flags = (neverAsciiEscape ? 1 /* NeverAsciiEscape */ : 0)
+                | (jsxAttributeEscape ? 2 /* JsxAttributeEscape */ : 0)
+                | (printerOptions.terminateUnterminatedLiterals ? 4 /* TerminateUnterminatedLiterals */ : 0);
+            return ts.getLiteralText(node, currentSourceFile, flags);
         }
         /**
          * Push a new name generation scope.
@@ -101104,84 +103470,84 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 227 /* Block */:
+                case 230 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 242 /* LabeledStatement */:
-                case 240 /* WithStatement */:
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
+                case 245 /* LabeledStatement */:
+                case 243 /* WithStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 231 /* IfStatement */:
+                case 234 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 234 /* ForStatement */:
-                case 236 /* ForOfStatement */:
-                case 235 /* ForInStatement */:
+                case 237 /* ForStatement */:
+                case 239 /* ForOfStatement */:
+                case 238 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 241 /* SwitchStatement */:
+                case 244 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 255 /* CaseBlock */:
+                case 258 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 281 /* CaseClause */:
-                case 282 /* DefaultClause */:
+                case 284 /* CaseClause */:
+                case 285 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 244 /* TryStatement */:
+                case 247 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 247 /* VariableDeclarationList */:
+                case 250 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 246 /* VariableDeclaration */:
-                case 159 /* Parameter */:
-                case 195 /* BindingElement */:
-                case 249 /* ClassDeclaration */:
+                case 249 /* VariableDeclaration */:
+                case 160 /* Parameter */:
+                case 198 /* BindingElement */:
+                case 252 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 193 /* ObjectBindingPattern */:
-                case 194 /* ArrayBindingPattern */:
+                case 196 /* ObjectBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 260 /* NamespaceImport */:
+                case 263 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 266 /* NamespaceExport */:
+                case 269 /* NamespaceExport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 261 /* NamedImports */:
+                case 264 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 262 /* ImportSpecifier */:
+                case 265 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -101190,12 +103556,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 285 /* PropertyAssignment */:
-                case 286 /* ShorthandPropertyAssignment */:
-                case 162 /* PropertyDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 288 /* PropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
+                case 163 /* PropertyDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -101377,23 +103743,23 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 253 /* ModuleDeclaration */:
-                case 252 /* EnumDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 258 /* ImportDeclaration */:
-                case 264 /* ExportDeclaration */:
+                case 261 /* ImportDeclaration */:
+                case 267 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 263 /* ExportAssignment */:
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 266 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 218 /* ClassExpression */:
+                case 221 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
-                case 157 /* ComputedPropertyName */:
+                case 158 /* ComputedPropertyName */:
                     return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
@@ -101441,7 +103807,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 !== 330 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 335 /* 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 */;
@@ -101465,7 +103831,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 === 247 /* VariableDeclarationList */) {
+                    if (node.kind === 250 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -101558,7 +103924,12 @@ var ts;
         function emitLeadingComments(pos, isEmittedNode) {
             hasWrittenComment = false;
             if (isEmittedNode) {
-                forEachLeadingCommentToEmit(pos, emitLeadingComment);
+                if (pos === 0 && (currentSourceFile === null || currentSourceFile === void 0 ? void 0 : currentSourceFile.isDeclarationFile)) {
+                    forEachLeadingCommentToEmit(pos, emitNonTripleSlashLeadingComment);
+                }
+                else {
+                    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,
@@ -101577,6 +103948,11 @@ var ts;
                 emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos);
             }
         }
+        function emitNonTripleSlashLeadingComment(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));
@@ -101724,7 +104100,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 !== 330 /* NotEmittedStatement */
+                if (node.kind !== 335 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -101737,7 +104113,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 330 /* NotEmittedStatement */
+                if (node.kind !== 335 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -101770,9 +104146,10 @@ var ts;
         function emitSourcePos(source, pos) {
             if (source !== sourceMapSource) {
                 var savedSourceMapSource = sourceMapSource;
+                var savedSourceMapSourceIndex = sourceMapSourceIndex;
                 setSourceMapSource(source);
                 emitPos(pos);
-                setSourceMapSource(savedSourceMapSource);
+                resetSourceMapSource(savedSourceMapSource, savedSourceMapSourceIndex);
             }
             else {
                 emitPos(pos);
@@ -101811,6 +104188,12 @@ var ts;
                 return;
             }
             sourceMapSource = source;
+            if (source === mostRecentlyAddedSourceMapSource) {
+                // Fast path for when the new source map is the most recently added, in which case
+                // we use its captured index without going through the source map generator.
+                sourceMapSourceIndex = mostRecentlyAddedSourceMapSourceIndex;
+                return;
+            }
             if (isJsonSourceMapSource(source)) {
                 return;
             }
@@ -101818,6 +104201,12 @@ var ts;
             if (printerOptions.inlineSources) {
                 sourceMapGenerator.setSourceContent(sourceMapSourceIndex, source.text);
             }
+            mostRecentlyAddedSourceMapSource = source;
+            mostRecentlyAddedSourceMapSourceIndex = sourceMapSourceIndex;
+        }
+        function resetSourceMapSource(source, sourceIndex) {
+            sourceMapSource = source;
+            sourceMapSourceIndex = sourceIndex;
         }
         function isJsonSourceMapSource(sourceFile) {
             return ts.fileExtensionIs(sourceFile.fileName, ".json" /* Json */);
@@ -102316,6 +104705,7 @@ var ts;
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = new ts.Map();
         var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
+        var computeHash = ts.maybeBind(system, system.createHash) || ts.generateDjb2Hash;
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -102360,14 +104750,14 @@ var ts;
         }
         var outputFingerprints;
         function writeFileWorker(fileName, data, writeByteOrderMark) {
-            if (!ts.isWatchSet(options) || !system.createHash || !system.getModifiedTime) {
+            if (!ts.isWatchSet(options) || !system.getModifiedTime) {
                 system.writeFile(fileName, data, writeByteOrderMark);
                 return;
             }
             if (!outputFingerprints) {
                 outputFingerprints = new ts.Map();
             }
-            var hash = system.createHash(data);
+            var hash = computeHash(data);
             var mtimeBefore = system.getModifiedTime(fileName);
             if (mtimeBefore) {
                 var fingerprint = outputFingerprints.get(fileName);
@@ -102720,6 +105110,35 @@ var ts;
     }
     ts.loadWithLocalCache = loadWithLocalCache;
     /* @internal */
+    function forEachResolvedProjectReference(resolvedProjectReferences, cb) {
+        return forEachProjectReference(/*projectReferences*/ undefined, resolvedProjectReferences, function (resolvedRef, parent) { return resolvedRef && cb(resolvedRef, parent); });
+    }
+    ts.forEachResolvedProjectReference = forEachResolvedProjectReference;
+    function forEachProjectReference(projectReferences, resolvedProjectReferences, cbResolvedRef, cbRef) {
+        var seenResolvedRefs;
+        return worker(projectReferences, resolvedProjectReferences, /*parent*/ undefined);
+        function worker(projectReferences, resolvedProjectReferences, parent) {
+            // Visit project references first
+            if (cbRef) {
+                var result = cbRef(projectReferences, parent);
+                if (result) {
+                    return result;
+                }
+            }
+            return ts.forEach(resolvedProjectReferences, function (resolvedRef, index) {
+                if (resolvedRef && (seenResolvedRefs === null || seenResolvedRefs === void 0 ? void 0 : seenResolvedRefs.has(resolvedRef.sourceFile.path))) {
+                    // ignore recursives
+                    return undefined;
+                }
+                var result = cbResolvedRef(resolvedRef, parent, index);
+                if (result || !resolvedRef)
+                    return result;
+                (seenResolvedRefs || (seenResolvedRefs = new ts.Set())).add(resolvedRef.sourceFile.path);
+                return worker(resolvedRef.commandLine.projectReferences, resolvedRef.references, resolvedRef);
+            });
+        }
+    }
+    /* @internal */
     ts.inferredTypesContainingFile = "__inferred type names__.ts";
     /**
      * Determines if program structure is upto date or needs to be recreated
@@ -102855,6 +105274,8 @@ var ts;
         var modulesWithElidedImports = new ts.Map();
         // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled.
         var sourceFilesFoundSearchingNodeModules = new ts.Map();
+        var tracingData = ["program" /* Program */, "createProgram"];
+        ts.tracing.begin.apply(ts.tracing, tracingData);
         ts.performance.mark("beforeProgram");
         var host = createProgramOptions.host || createCompilerHost(options);
         var configParsingHost = parseConfigHostFromCompilerHostLike(host);
@@ -102930,12 +105351,16 @@ var ts;
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
         }), onProgramCreateComplete = _c.onProgramCreateComplete, fileExists = _c.fileExists, directoryExists = _c.directoryExists;
+        ts.tracing.push("program" /* Program */, "shouldProgramCreateNewSourceFiles", { hasOldProgram: !!oldProgram });
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
+        ts.tracing.pop();
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
-        var structuralIsReused;
-        structuralIsReused = tryReuseStructureFromOldProgram(); // eslint-disable-line prefer-const
-        if (structuralIsReused !== 2 /* Completely */) {
+        var structureIsReused;
+        ts.tracing.push("program" /* Program */, "tryReuseStructureFromOldProgram", {});
+        structureIsReused = tryReuseStructureFromOldProgram(); // eslint-disable-line prefer-const
+        ts.tracing.pop();
+        if (structureIsReused !== 2 /* Completely */) {
             processingDefaultLibFiles = [];
             processingOtherFiles = [];
             if (projectReferences) {
@@ -102972,10 +105397,13 @@ var ts;
                     }
                 }
             }
+            ts.tracing.push("program" /* Program */, "processRootFiles", { count: rootNames.length });
             ts.forEach(rootNames, function (name) { return processRootFile(name, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false); });
+            ts.tracing.pop();
             // 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) {
+                ts.tracing.push("program" /* Program */, "processTypeReferences", { count: 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, ts.inferredTypesContainingFile);
@@ -102983,6 +105411,7 @@ var ts;
                 for (var i = 0; i < typeReferences.length; i++) {
                     processTypeReferenceDirective(typeReferences[i], resolutions[i]);
                 }
+                ts.tracing.pop();
             }
             // Do not process the default library if:
             //  - The '--noLib' flag is used.
@@ -103023,8 +105452,8 @@ var ts;
                     host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
                 }
             }
-            oldProgram.forEachResolvedProjectReference(function (resolvedProjectReference, resolvedProjectReferencePath) {
-                if (resolvedProjectReference && !getResolvedProjectReferenceByPath(resolvedProjectReferencePath)) {
+            oldProgram.forEachResolvedProjectReference(function (resolvedProjectReference) {
+                if (!getResolvedProjectReferenceByPath(resolvedProjectReference.sourceFile.path)) {
                     host.onReleaseOldSourceFile(resolvedProjectReference.sourceFile, oldProgram.getCompilerOptions(), /*hasSourceFileByPath*/ false);
                 }
             });
@@ -103044,6 +105473,7 @@ var ts;
             getOptionsDiagnostics: getOptionsDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getSemanticDiagnostics: getSemanticDiagnostics,
+            getCachedSemanticDiagnostics: getCachedSemanticDiagnostics,
             getSuggestionDiagnostics: getSuggestionDiagnostics,
             getDeclarationDiagnostics: getDeclarationDiagnostics,
             getBindAndCheckDiagnostics: getBindAndCheckDiagnostics,
@@ -103057,6 +105487,7 @@ var ts;
             getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
+            getTypeCatalog: function () { return getDiagnosticsProducingTypeChecker().getTypeCatalog(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getInstantiationCount: function () { return getDiagnosticsProducingTypeChecker().getInstantiationCount(); },
             getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
@@ -103085,26 +105516,73 @@ var ts;
             getSymlinkCache: getSymlinkCache,
             realpath: (_b = host.realpath) === null || _b === void 0 ? void 0 : _b.bind(host),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+            structureIsReused: structureIsReused,
         };
         onProgramCreateComplete();
         verifyCompilerOptions();
         ts.performance.mark("afterProgram");
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
+        ts.tracing.end.apply(ts.tracing, tracingData);
         return program;
-        function resolveModuleNamesWorker(moduleNames, containingFile, reusedNames, redirectedReference) {
+        function resolveModuleNamesWorker(moduleNames, containingFile, reusedNames) {
+            if (!moduleNames.length)
+                return ts.emptyArray;
+            var containingFileName = ts.getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory);
+            var redirectedReference = getRedirectReferenceForResolution(containingFile);
+            ts.tracing.push("program" /* Program */, "resolveModuleNamesWorker", { containingFileName: containingFileName });
             ts.performance.mark("beforeResolveModule");
-            var result = actualResolveModuleNamesWorker(moduleNames, containingFile, reusedNames, redirectedReference);
+            var result = actualResolveModuleNamesWorker(moduleNames, containingFileName, reusedNames, redirectedReference);
             ts.performance.mark("afterResolveModule");
             ts.performance.measure("ResolveModule", "beforeResolveModule", "afterResolveModule");
+            ts.tracing.pop();
             return result;
         }
-        function resolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFile, redirectedReference) {
+        function resolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFile) {
+            if (!typeDirectiveNames.length)
+                return [];
+            var containingFileName = !ts.isString(containingFile) ? ts.getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory) : containingFile;
+            var redirectedReference = !ts.isString(containingFile) ? getRedirectReferenceForResolution(containingFile) : undefined;
+            ts.tracing.push("program" /* Program */, "resolveTypeReferenceDirectiveNamesWorker", { containingFileName: containingFileName });
             ts.performance.mark("beforeResolveTypeReference");
-            var result = actualResolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFile, redirectedReference);
+            var result = actualResolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFileName, redirectedReference);
             ts.performance.mark("afterResolveTypeReference");
             ts.performance.measure("ResolveTypeReference", "beforeResolveTypeReference", "afterResolveTypeReference");
+            ts.tracing.pop();
             return result;
         }
+        function getRedirectReferenceForResolution(file) {
+            var redirect = getResolvedProjectReferenceToRedirect(file.originalFileName);
+            if (redirect || !ts.fileExtensionIs(file.originalFileName, ".d.ts" /* Dts */))
+                return redirect;
+            // The originalFileName could not be actual source file name if file found was d.ts from referecned project
+            // So in this case try to look up if this is output from referenced project, if it is use the redirected project in that case
+            var resultFromDts = getRedirectReferenceForResolutionFromSourceOfProject(file.originalFileName, file.path);
+            if (resultFromDts)
+                return resultFromDts;
+            // If preserveSymlinks is true, module resolution wont jump the symlink
+            // but the resolved real path may be the .d.ts from project reference
+            // Note:: Currently we try the real path only if the
+            // file is from node_modules to avoid having to run real path on all file paths
+            if (!host.realpath || !options.preserveSymlinks || !ts.stringContains(file.originalFileName, ts.nodeModulesPathPart))
+                return undefined;
+            var realDeclarationFileName = host.realpath(file.originalFileName);
+            var realDeclarationPath = toPath(realDeclarationFileName);
+            return realDeclarationPath === file.path ? undefined : getRedirectReferenceForResolutionFromSourceOfProject(realDeclarationFileName, realDeclarationPath);
+        }
+        function getRedirectReferenceForResolutionFromSourceOfProject(fileName, filePath) {
+            var source = getSourceOfProjectReferenceRedirect(fileName);
+            if (ts.isString(source))
+                return getResolvedProjectReferenceToRedirect(source);
+            if (!source)
+                return undefined;
+            // Output of .d.ts file so return resolved ref that matches the out file name
+            return forEachResolvedProjectReference(function (resolvedRef) {
+                var out = ts.outFile(resolvedRef.commandLine.options);
+                if (!out)
+                    return undefined;
+                return toPath(out) === filePath ? resolvedRef : undefined;
+            });
+        }
         function compareDefaultLibFiles(a, b) {
             return ts.compareValues(getDefaultLibFilePriority(a), getDefaultLibFilePriority(b));
         }
@@ -103163,13 +105641,13 @@ var ts;
             }
             return classifiableNames;
         }
-        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file) {
-            if (structuralIsReused === 0 /* Not */ && !file.ambientModuleNames.length) {
+        function resolveModuleNamesReusingOldState(moduleNames, file) {
+            if (structureIsReused === 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));
+                return resolveModuleNamesWorker(moduleNames, file, /*reusedNames*/ undefined);
             }
-            var oldSourceFile = oldProgram && oldProgram.getSourceFile(containingFile);
+            var oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
             if (oldSourceFile !== file && file.resolvedModules) {
                 // `file` was created for the new program.
                 //
@@ -103179,13 +105657,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_12 = [];
+                var result_14 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_12.push(resolvedModule);
+                    result_14.push(resolvedModule);
                 }
-                return result_12;
+                return result_14;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -103213,7 +105691,7 @@ var ts;
                     var oldResolvedModule = ts.getResolvedModule(oldSourceFile, 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);
+                            ts.trace(host, ts.Diagnostics.Reusing_resolution_of_module_0_to_file_1_from_old_program, moduleName, ts.getNormalizedAbsolutePath(file.originalFileName, currentDirectory));
                         }
                         (result || (result = new Array(moduleNames.length)))[i] = oldResolvedModule;
                         (reusedNames || (reusedNames = [])).push(moduleName);
@@ -103228,7 +105706,7 @@ var ts;
                 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);
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, ts.getNormalizedAbsolutePath(file.originalFileName, currentDirectory));
                     }
                 }
                 else {
@@ -103243,7 +105721,7 @@ var ts;
                 }
             }
             var resolutions = unknownModuleNames && unknownModuleNames.length
-                ? resolveModuleNamesWorker(unknownModuleNames, containingFile, reusedNames, getResolvedProjectReferenceToRedirect(file.originalFileName))
+                ? resolveModuleNamesWorker(unknownModuleNames, file, reusedNames)
                 : ts.emptyArray;
             // Combine results of resolutions and predicted results
             if (!result) {
@@ -103291,7 +105769,7 @@ var ts;
             }
         }
         function canReuseProjectReferences() {
-            return !forEachProjectReference(oldProgram.getProjectReferences(), oldProgram.getResolvedProjectReferences(), function (oldResolvedRef, index, parent) {
+            return !forEachProjectReference(oldProgram.getProjectReferences(), oldProgram.getResolvedProjectReferences(), function (oldResolvedRef, parent, index) {
                 var newRef = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
                 var newResolvedRef = parseProjectReferenceConfigFile(newRef);
                 if (oldResolvedRef) {
@@ -103317,19 +105795,19 @@ var ts;
             // 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 */;
+                return 0 /* Not */;
             }
             // 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 */;
+                return 0 /* Not */;
             }
             if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
-                return oldProgram.structureIsReused = 0 /* Not */;
+                return 0 /* Not */;
             }
             // Check if any referenced project tsconfig files are different
             if (!canReuseProjectReferences()) {
-                return oldProgram.structureIsReused = 0 /* Not */;
+                return 0 /* Not */;
             }
             if (projectReferences) {
                 resolvedProjectReferences = projectReferences.map(parseProjectReferenceConfigFile);
@@ -103337,12 +105815,12 @@ var ts;
             // 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 */;
+            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 */;
+                return 0 /* Not */;
             }
             var oldSourceFiles = oldProgram.getSourceFiles();
             var SeenPackageName;
@@ -103357,7 +105835,7 @@ var ts;
                     ? 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 */;
+                    return 0 /* Not */;
                 }
                 ts.Debug.assert(!newSourceFile.redirectInfo, "Host should not return a redirect source file from `getSourceFile`");
                 var fileChanged = void 0;
@@ -103366,7 +105844,7 @@ var ts;
                     // 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 */;
+                        return 0 /* Not */;
                     }
                     fileChanged = false;
                     newSourceFile = oldSourceFile; // Use the redirect.
@@ -103374,7 +105852,7 @@ var ts;
                 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 */;
+                        return 0 /* Not */;
                     }
                     fileChanged = false;
                 }
@@ -103393,7 +105871,7 @@ var ts;
                     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 */;
+                        return 0 /* Not */;
                     }
                     seenPackageNames.set(packageName, newKind);
                 }
@@ -103401,50 +105879,50 @@ var ts;
                     // 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 */;
+                        return 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 */;
+                        structureIsReused = 1 /* SafeModules */;
                     }
                     // check tripleslash references
                     if (!ts.arrayIsEqualTo(oldSourceFile.referencedFiles, newSourceFile.referencedFiles, fileReferenceIsEqualTo)) {
                         // tripleslash references has changed
-                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        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 */;
+                        structureIsReused = 1 /* SafeModules */;
                     }
                     if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
                         // moduleAugmentations has changed
-                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        structureIsReused = 1 /* SafeModules */;
                     }
                     if ((oldSourceFile.flags & 3145728 /* PermanentlySetIncrementalFlags */) !== (newSourceFile.flags & 3145728 /* PermanentlySetIncrementalFlags */)) {
                         // dynamicImport has changed
-                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        structureIsReused = 1 /* SafeModules */;
                     }
                     if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
                         // 'types' references has changed
-                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        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 */;
+                    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;
+            if (structureIsReused !== 2 /* Completely */) {
+                return structureIsReused;
             }
             var modifiedFiles = modifiedSourceFiles.map(function (f) { return f.oldFile; });
             for (var _b = 0, oldSourceFiles_3 = oldSourceFiles; _b < oldSourceFiles_3.length; _b++) {
@@ -103459,38 +105937,35 @@ var ts;
             // try to verify results of module resolution
             for (var _e = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _e < modifiedSourceFiles_1.length; _e++) {
                 var _f = modifiedSourceFiles_1[_e], oldSourceFile = _f.oldFile, newSourceFile = _f.newFile;
-                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.originalFileName, currentDirectory);
                 var moduleNames = getModuleNames(newSourceFile);
-                var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, 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 */;
+                    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 ts.toFileNameLowerCase(ref.fileName); });
-                    var resolutions_1 = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath, getResolvedProjectReferenceToRedirect(newSourceFile.originalFileName));
-                    // ensure that types resolutions are still correct
-                    var resolutionsChanged_1 = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions_1, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                    if (resolutionsChanged_1) {
-                        oldProgram.structureIsReused = 1 /* SafeModules */;
-                        newSourceFile.resolvedTypeReferenceDirectiveNames = ts.zipToMap(typesReferenceDirectives, resolutions_1);
-                    }
-                    else {
-                        newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    }
+                // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+                var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (ref) { return ts.toFileNameLowerCase(ref.fileName); });
+                var typeReferenceResolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFile);
+                // ensure that types resolutions are still correct
+                var typeReferenceEesolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                if (typeReferenceEesolutionsChanged) {
+                    structureIsReused = 1 /* SafeModules */;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = ts.zipToMap(typesReferenceDirectives, typeReferenceResolutions);
+                }
+                else {
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                 }
             }
-            if (oldProgram.structureIsReused !== 2 /* Completely */) {
-                return oldProgram.structureIsReused;
+            if (structureIsReused !== 2 /* Completely */) {
+                return structureIsReused;
             }
             if ((_a = host.hasChangedAutomaticTypeDirectiveNames) === null || _a === void 0 ? void 0 : _a.call(host)) {
-                return oldProgram.structureIsReused = 1 /* SafeModules */;
+                return 1 /* SafeModules */;
             }
             missingFilePaths = oldProgram.getMissingFilePaths();
             refFileMap = oldProgram.getRefFileMap();
@@ -103524,7 +105999,7 @@ var ts;
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             sourceFileToPackageName = oldProgram.sourceFileToPackageName;
             redirectTargetsMap = oldProgram.redirectTargetsMap;
-            return oldProgram.structureIsReused = 2 /* Completely */;
+            return 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
             return {
@@ -103564,6 +106039,8 @@ var ts;
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!ts.outFile(options));
+            var tracingData = ["emit" /* Emit */, "emitBuildInfo"];
+            ts.tracing.begin.apply(ts.tracing, tracingData);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
@@ -103572,6 +106049,7 @@ var ts;
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
+            ts.tracing.end.apply(ts.tracing, tracingData);
             return emitResult;
         }
         function getResolvedProjectReferences() {
@@ -103617,7 +106095,11 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers, forceDtsEmit) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers, forceDtsEmit); });
+            var tracingData = ["emit" /* Emit */, "emit", { path: sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.path }];
+            ts.tracing.begin.apply(ts.tracing, tracingData);
+            var result = runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers, forceDtsEmit); });
+            ts.tracing.end.apply(ts.tracing, tracingData);
+            return result;
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.has(toPath(emitFileName));
@@ -103667,6 +106149,11 @@ var ts;
         function getSemanticDiagnostics(sourceFile, cancellationToken) {
             return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
         }
+        function getCachedSemanticDiagnostics(sourceFile) {
+            var _a;
+            return sourceFile
+                ? (_a = cachedBindAndCheckDiagnosticsForFile.perFile) === null || _a === void 0 ? void 0 : _a.get(sourceFile.path) : cachedBindAndCheckDiagnosticsForFile.allDiagnostics;
+        }
         function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
             return getBindAndCheckDiagnosticsForFile(sourceFile, cancellationToken);
         }
@@ -103752,17 +106239,17 @@ var ts;
                     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;
-                return getMergedBindAndCheckDiagnostics(sourceFile, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
+                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
             });
         }
-        function getMergedBindAndCheckDiagnostics(sourceFile) {
+        function getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics) {
             var _a;
             var allDiagnostics = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                allDiagnostics[_i - 1] = arguments[_i];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                allDiagnostics[_i - 2] = arguments[_i];
             }
             var flatDiagnostics = ts.flatten(allDiagnostics);
-            if (!((_a = sourceFile.commentDirectives) === null || _a === void 0 ? void 0 : _a.length)) {
+            if (!includeBindAndCheckDiagnostics || !((_a = sourceFile.commentDirectives) === null || _a === void 0 ? void 0 : _a.length)) {
                 return flatDiagnostics;
             }
             var _b = getDiagnosticsWithPrecedingDirectives(sourceFile, sourceFile.commentDirectives, flatDiagnostics), diagnostics = _b.diagnostics, directives = _b.directives;
@@ -103823,22 +106310,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 159 /* Parameter */:
-                        case 162 /* PropertyDeclaration */:
-                        case 164 /* MethodDeclaration */:
+                        case 160 /* Parameter */:
+                        case 163 /* PropertyDeclaration */:
+                        case 165 /* MethodDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, "?"));
                                 return "skip";
                             }
                         // falls through
-                        case 163 /* MethodSignature */:
-                        case 165 /* Constructor */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
-                        case 205 /* FunctionExpression */:
-                        case 248 /* FunctionDeclaration */:
-                        case 206 /* ArrowFunction */:
-                        case 246 /* VariableDeclaration */:
+                        case 164 /* MethodSignature */:
+                        case 166 /* Constructor */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
+                        case 208 /* FunctionExpression */:
+                        case 251 /* FunctionDeclaration */:
+                        case 209 /* ArrowFunction */:
+                        case 249 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_annotations_can_only_be_used_in_TypeScript_files));
@@ -103846,58 +106333,58 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 259 /* ImportClause */:
+                        case 262 /* ImportClause */:
                             if (node.isTypeOnly) {
-                                diagnostics.push(createDiagnosticForNode(node.parent, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "import type"));
+                                diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "import type"));
                                 return "skip";
                             }
                             break;
-                        case 264 /* ExportDeclaration */:
+                        case 267 /* ExportDeclaration */:
                             if (node.isTypeOnly) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "export type"));
                                 return "skip";
                             }
                             break;
-                        case 257 /* ImportEqualsDeclaration */:
+                        case 260 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 263 /* ExportAssignment */:
+                        case 266 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_TypeScript_files));
                                 return "skip";
                             }
                             break;
-                        case 283 /* HeritageClause */:
+                        case 286 /* HeritageClause */:
                             var heritageClause = node;
                             if (heritageClause.token === 116 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_TypeScript_files));
                                 return "skip";
                             }
                             break;
-                        case 250 /* InterfaceDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
                             var interfaceKeyword = ts.tokenToString(117 /* InterfaceKeyword */);
                             ts.Debug.assertIsDefined(interfaceKeyword);
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, interfaceKeyword));
                             return "skip";
-                        case 253 /* ModuleDeclaration */:
-                            var moduleKeyword = node.flags & 16 /* Namespace */ ? ts.tokenToString(139 /* NamespaceKeyword */) : ts.tokenToString(138 /* ModuleKeyword */);
+                        case 256 /* ModuleDeclaration */:
+                            var moduleKeyword = node.flags & 16 /* Namespace */ ? ts.tokenToString(140 /* NamespaceKeyword */) : ts.tokenToString(139 /* ModuleKeyword */);
                             ts.Debug.assertIsDefined(moduleKeyword);
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, moduleKeyword));
                             return "skip";
-                        case 251 /* TypeAliasDeclaration */:
+                        case 254 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 252 /* EnumDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             var enumKeyword = ts.Debug.checkDefined(ts.tokenToString(91 /* EnumKeyword */));
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
                             return "skip";
-                        case 222 /* NonNullExpression */:
+                        case 225 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Non_null_assertions_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 221 /* AsExpression */:
+                        case 224 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.Type_assertion_expressions_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 203 /* TypeAssertionExpression */:
+                        case 206 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                 }
@@ -103906,29 +106393,29 @@ var ts;
                         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 249 /* ClassDeclaration */:
-                        case 218 /* ClassExpression */:
-                        case 164 /* MethodDeclaration */:
-                        case 165 /* Constructor */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
-                        case 205 /* FunctionExpression */:
-                        case 248 /* FunctionDeclaration */:
-                        case 206 /* ArrowFunction */:
+                        case 252 /* ClassDeclaration */:
+                        case 221 /* ClassExpression */:
+                        case 165 /* MethodDeclaration */:
+                        case 166 /* Constructor */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
+                        case 208 /* FunctionExpression */:
+                        case 251 /* FunctionDeclaration */:
+                        case 209 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Type_parameter_declarations_can_only_be_used_in_TypeScript_files));
                                 return "skip";
                             }
                         // falls through
-                        case 229 /* VariableStatement */:
+                        case 232 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                checkModifiers(parent.modifiers, parent.kind === 229 /* VariableStatement */);
+                                checkModifiers(parent.modifiers, parent.kind === 232 /* VariableStatement */);
                                 return "skip";
                             }
                             break;
-                        case 162 /* PropertyDeclaration */:
+                        case 163 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
@@ -103940,19 +106427,19 @@ var ts;
                                 return "skip";
                             }
                             break;
-                        case 159 /* Parameter */:
+                        case 160 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Parameter_modifiers_can_only_be_used_in_TypeScript_files));
                                 return "skip";
                             }
                             break;
-                        case 200 /* CallExpression */:
-                        case 201 /* NewExpression */:
-                        case 220 /* ExpressionWithTypeArguments */:
-                        case 271 /* JsxSelfClosingElement */:
-                        case 272 /* JsxOpeningElement */:
-                        case 202 /* TaggedTemplateExpression */:
+                        case 203 /* CallExpression */:
+                        case 204 /* NewExpression */:
+                        case 223 /* ExpressionWithTypeArguments */:
+                        case 274 /* JsxSelfClosingElement */:
+                        case 275 /* JsxOpeningElement */:
+                        case 205 /* TaggedTemplateExpression */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Type_arguments_can_only_be_used_in_TypeScript_files));
@@ -103974,7 +106461,7 @@ var ts;
                             case 122 /* PublicKeyword */:
                             case 120 /* PrivateKeyword */:
                             case 121 /* ProtectedKeyword */:
-                            case 141 /* ReadonlyKeyword */:
+                            case 142 /* ReadonlyKeyword */:
                             case 133 /* DeclareKeyword */:
                             case 125 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, ts.tokenToString(modifier.kind)));
@@ -104035,9 +106522,7 @@ var ts;
             }
             var diagnostics = programDiagnostics.getDiagnostics(options.configFile.fileName);
             forEachResolvedProjectReference(function (resolvedRef) {
-                if (resolvedRef) {
-                    diagnostics = ts.concatenate(diagnostics, programDiagnostics.getDiagnostics(resolvedRef.sourceFile.fileName));
-                }
+                diagnostics = ts.concatenate(diagnostics, programDiagnostics.getDiagnostics(resolvedRef.sourceFile.fileName));
             });
             return diagnostics;
         }
@@ -104058,6 +106543,18 @@ var ts;
                 ? b.kind === 78 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
+        function createSyntheticImport(text, file) {
+            var externalHelpersModuleReference = ts.factory.createStringLiteral(text);
+            var importDecl = ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, externalHelpersModuleReference);
+            ts.addEmitFlags(importDecl, 67108864 /* NeverApplyImportHelper */);
+            ts.setParent(externalHelpersModuleReference, importDecl);
+            ts.setParent(importDecl, file);
+            // explicitly unset the synthesized flag on these declarations so the checker API will answer questions about them
+            // (which is required to build the dependency graph for incremental emit)
+            externalHelpersModuleReference.flags &= ~8 /* Synthesized */;
+            importDecl.flags &= ~8 /* Synthesized */;
+            return externalHelpersModuleReference;
+        }
         function collectExternalModuleReferences(file) {
             if (file.imports) {
                 return;
@@ -104070,16 +106567,17 @@ var ts;
             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)
+            if ((options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                // synthesize 'import "tslib"' declaration
-                var externalHelpersModuleReference = ts.factory.createStringLiteral(ts.externalHelpersModuleNameText);
-                var importDecl = ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, externalHelpersModuleReference);
-                ts.addEmitFlags(importDecl, 67108864 /* NeverApplyImportHelper */);
-                ts.setParent(externalHelpersModuleReference, importDecl);
-                ts.setParent(importDecl, file);
-                imports = [externalHelpersModuleReference];
+                if (options.importHelpers) {
+                    // synthesize 'import "tslib"' declaration
+                    imports = [createSyntheticImport(ts.externalHelpersModuleNameText, file)];
+                }
+                var jsxImport = ts.getJSXRuntimeImport(ts.getJSXImplicitImportBase(options, file), options);
+                if (jsxImport) {
+                    // synthesize `import "base/jsx-runtime"` declaration
+                    (imports || (imports = [])).push(createSyntheticImport(jsxImport, file));
+                }
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var node = _a[_i];
@@ -104263,6 +106761,16 @@ var ts;
         }
         // Get source file from normalized fileName
         function findSourceFile(fileName, path, isDefaultLib, ignoreNoDefaultLib, refFile, packageId) {
+            ts.tracing.push("program" /* Program */, "findSourceFile", {
+                fileName: fileName,
+                isDefaultLib: isDefaultLib || undefined,
+                refKind: refFile ? ts.RefFileKind[refFile.kind] : undefined,
+            });
+            var result = findSourceFileWorker(fileName, path, isDefaultLib, ignoreNoDefaultLib, refFile, packageId);
+            ts.tracing.pop();
+            return result;
+        }
+        function findSourceFileWorker(fileName, path, isDefaultLib, ignoreNoDefaultLib, refFile, packageId) {
             if (useSourceOfProjectReferenceRedirect) {
                 var source = getSourceOfProjectReferenceRedirect(fileName);
                 // If preserveSymlinks is true, module resolution wont jump the symlink
@@ -104450,12 +106958,11 @@ var ts;
         function getResolvedProjectReferenceToRedirect(fileName) {
             if (mapFromFileToProjectReferenceRedirects === undefined) {
                 mapFromFileToProjectReferenceRedirects = new ts.Map();
-                forEachResolvedProjectReference(function (referencedProject, referenceProjectPath) {
+                forEachResolvedProjectReference(function (referencedProject) {
                     // not input file from the referenced project, ignore
-                    if (referencedProject &&
-                        toPath(options.configFilePath) !== referenceProjectPath) {
+                    if (toPath(options.configFilePath) !== referencedProject.sourceFile.path) {
                         referencedProject.commandLine.fileNames.forEach(function (f) {
-                            return mapFromFileToProjectReferenceRedirects.set(toPath(f), referenceProjectPath);
+                            return mapFromFileToProjectReferenceRedirects.set(toPath(f), referencedProject.sourceFile.path);
                         });
                     }
                 });
@@ -104464,11 +106971,7 @@ var ts;
             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);
-            });
+            return ts.forEachResolvedProjectReference(resolvedProjectReferences, cb);
         }
         function getSourceOfProjectReferenceRedirect(file) {
             if (!ts.isDeclarationFileName(file))
@@ -104476,21 +106979,19 @@ var ts;
             if (mapFromToProjectReferenceRedirectSource === undefined) {
                 mapFromToProjectReferenceRedirectSource = new ts.Map();
                 forEachResolvedProjectReference(function (resolvedRef) {
-                    if (resolvedRef) {
-                        var out = ts.outFile(resolvedRef.commandLine.options);
-                        if (out) {
-                            // Dont know which source file it means so return true?
-                            var outputDts = ts.changeExtension(out, ".d.ts" /* Dts */);
-                            mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), true);
-                        }
-                        else {
-                            ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
-                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
-                                    var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames());
-                                    mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
-                                }
-                            });
-                        }
+                    var out = ts.outFile(resolvedRef.commandLine.options);
+                    if (out) {
+                        // Dont know which source file it means so return true?
+                        var outputDts = ts.changeExtension(out, ".d.ts" /* Dts */);
+                        mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), true);
+                    }
+                    else {
+                        ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
+                            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+                                var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames());
+                                mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
+                            }
+                        });
                     }
                 });
             }
@@ -104499,33 +107000,6 @@ var ts;
         function isSourceOfProjectReferenceRedirect(fileName) {
             return useSourceOfProjectReferenceRedirect && !!getResolvedProjectReferenceToRedirect(fileName);
         }
-        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;
@@ -104552,7 +107026,7 @@ var ts;
             if (!typeDirectives) {
                 return;
             }
-            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.originalFileName, getResolvedProjectReferenceToRedirect(file.originalFileName));
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file);
             for (var i = 0; i < typeDirectives.length; i++) {
                 var ref = file.typeReferenceDirectives[i];
                 var resolvedTypeReferenceDirective = resolutions[i];
@@ -104569,6 +107043,11 @@ var ts;
             }
         }
         function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile) {
+            ts.tracing.push("program" /* Program */, "processTypeReferenceDirective", { directive: typeReferenceDirective, hasResolved: !!resolveModuleNamesReusingOldState, refKind: refFile === null || refFile === void 0 ? void 0 : refFile.kind, refPath: refFile === null || refFile === void 0 ? void 0 : refFile.file.path });
+            processTypeReferenceDirectiveWorker(typeReferenceDirective, resolvedTypeReferenceDirective, refFile);
+            ts.tracing.pop();
+        }
+        function processTypeReferenceDirectiveWorker(typeReferenceDirective, resolvedTypeReferenceDirective, refFile) {
             // If we already found this library as a primary reference - nothing to do
             var previousResolution = resolvedTypeReferenceDirectives.get(typeReferenceDirective);
             if (previousResolution && previousResolution.primary) {
@@ -104653,7 +107132,7 @@ var ts;
             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);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, file);
                 ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
@@ -104681,7 +107160,7 @@ var ts;
                         && !options.noResolve
                         && i < file.imports.length
                         && !elideImport
-                        && !(isJsFile && !options.allowJs)
+                        && !(isJsFile && !ts.getAllowJSCompilerOption(options))
                         && (ts.isInJSFile(file.imports[i]) || !(file.imports[i].flags & 4194304 /* JSDoc */));
                     if (elideImport) {
                         modulesWithElidedImports.set(file.path, true);
@@ -104797,9 +107276,6 @@ var ts;
                     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");
@@ -104849,6 +107325,9 @@ var ts;
                                 if (!ts.hasZeroOrOneAsteriskCharacter(subst)) {
                                     createDiagnosticForOptionPathKeyValue(key, i, ts.Diagnostics.Substitution_0_in_pattern_1_can_have_at_most_one_Asterisk_character, subst, key);
                                 }
+                                if (!options.baseUrl && !ts.pathIsRelative(subst) && !ts.pathIsAbsolute(subst)) {
+                                    createDiagnosticForOptionPathKeyValue(key, i, ts.Diagnostics.Non_relative_paths_are_not_allowed_when_baseUrl_is_not_set_Did_you_forget_a_leading_Slash);
+                                }
                             }
                             else {
                                 createDiagnosticForOptionPathKeyValue(key, i, ts.Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst);
@@ -104901,7 +107380,7 @@ var ts;
                 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.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics._0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module, ts.getBaseFileName(firstNonExternalModuleSourceFile.fileName)));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -104943,7 +107422,7 @@ var ts;
             if (options.useDefineForClassFields && languageVersion === 0 /* ES3 */) {
                 createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
             }
-            if (options.checkJs && !options.allowJs) {
+            if (options.checkJs && !ts.getAllowJSCompilerOption(options)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));
             }
             if (options.emitDeclarationOnly) {
@@ -104962,6 +107441,9 @@ var ts;
                 if (options.reactNamespace) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory");
                 }
+                if (options.jsx === 4 /* ReactJSX */ || options.jsx === 5 /* ReactJSXDev */) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_when_option_jsx_is_1, "jsxFactory", ts.inverseJsxOptionMap.get("" + options.jsx));
+                }
                 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);
                 }
@@ -104973,10 +107455,23 @@ var ts;
                 if (!options.jsxFactory) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "jsxFragmentFactory", "jsxFactory");
                 }
+                if (options.jsx === 4 /* ReactJSX */ || options.jsx === 5 /* ReactJSXDev */) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_when_option_jsx_is_1, "jsxFragmentFactory", ts.inverseJsxOptionMap.get("" + options.jsx));
+                }
                 if (!ts.parseIsolatedEntityName(options.jsxFragmentFactory, languageVersion)) {
                     createOptionValueDiagnostic("jsxFragmentFactory", ts.Diagnostics.Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFragmentFactory);
                 }
             }
+            if (options.reactNamespace) {
+                if (options.jsx === 4 /* ReactJSX */ || options.jsx === 5 /* ReactJSXDev */) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_when_option_jsx_is_1, "reactNamespace", ts.inverseJsxOptionMap.get("" + options.jsx));
+                }
+            }
+            if (options.jsxImportSource) {
+                if (options.jsx === 2 /* React */) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_when_option_jsx_is_1, "jsxImportSource", ts.inverseJsxOptionMap.get("" + options.jsx));
+                }
+            }
             // 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();
@@ -105051,7 +107546,7 @@ var ts;
         }
         function verifyProjectReferences() {
             var buildInfoPath = !options.suppressOutputPathCheck ? ts.getTsBuildInfoEmitOutputFilePath(options) : undefined;
-            forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, index, parent) {
+            forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, parent, index) {
                 var ref = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
                 var parentFile = parent && parent.sourceFile;
                 if (!resolvedRef) {
@@ -105246,8 +107741,6 @@ var ts;
                 if (!setOfDeclarationDirectories) {
                     setOfDeclarationDirectories = new ts.Set();
                     host.forEachResolvedProjectReference(function (ref) {
-                        if (!ref)
-                            return;
                         var out = ts.outFile(ref.commandLine.options);
                         if (out) {
                             setOfDeclarationDirectories.add(ts.getDirectoryPath(host.toPath(out)));
@@ -105480,7 +107973,7 @@ var ts;
             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;
+            return ts.getAllowJSCompilerOption(options) || !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;
@@ -105634,7 +108127,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 = ts.Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
+                var version_2 = ts.Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.resolvedPath) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -105649,7 +108142,7 @@ var ts;
                         }
                     }
                 }
-                fileInfos.set(sourceFile.resolvedPath, { version: version_1, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) });
+                fileInfos.set(sourceFile.resolvedPath, { version: version_2, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) });
             }
             return {
                 fileInfos: fileInfos,
@@ -105751,7 +108244,7 @@ var ts;
                     emitOutput_1.outputFiles.length > 0 ? emitOutput_1.outputFiles[0] : undefined;
                 if (firstDts_1) {
                     ts.Debug.assert(ts.fileExtensionIs(firstDts_1.name, ".d.ts" /* Dts */), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
-                    latestSignature = computeHash(firstDts_1.text);
+                    latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
                     }
@@ -105944,14 +108437,12 @@ var ts;
                 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));
+                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache)) {
+                        queue.push.apply(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 = {}));
@@ -106072,7 +108563,7 @@ var ts;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
                     relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
-                    ts.emptyArray :
+                    [] :
                 undefined;
             return result;
         });
@@ -106264,10 +108755,10 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
-    function isChangedSignagure(state, path) {
+    function isChangedSignature(state, path) {
         var newSignature = ts.Debug.checkDefined(state.currentAffectedFilesSignatures).get(path);
-        var oldSignagure = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
-        return newSignature !== oldSignagure;
+        var oldSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
+        return newSignature !== oldSignature;
     }
     /**
      * Iterate on referencing modules that export entities from affected file
@@ -106278,7 +108769,7 @@ var ts;
         if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath)) {
             return;
         }
-        if (!isChangedSignagure(state, affectedFile.resolvedPath))
+        if (!isChangedSignature(state, affectedFile.resolvedPath))
             return;
         // Since isolated modules dont change js files, files affected by change in signature is itself
         // But we need to cleanup semantic diagnostics and queue dts emit for affected files
@@ -106291,7 +108782,7 @@ var ts;
                 if (!seenFileNamesMap.has(currentPath)) {
                     seenFileNamesMap.set(currentPath, true);
                     var result = fn(state, currentPath);
-                    if (result && isChangedSignagure(state, currentPath)) {
+                    if (result && isChangedSignature(state, currentPath)) {
                         var currentSourceFile = ts.Debug.checkDefined(state.program).getSourceFileByPath(currentPath);
                         queue.push.apply(queue, ts.BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath));
                     }
@@ -106541,7 +109032,7 @@ var ts;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
                     relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
-                    ts.emptyArray :
+                    [] :
                 undefined;
             return result;
         });
@@ -106603,7 +109094,7 @@ var ts;
         /**
          * Computing hash to for signature verification
          */
-        var computeHash = host.createHash || ts.generateDjb2Hash;
+        var computeHash = ts.maybeBind(host, host.createHash);
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
         newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
@@ -106699,31 +109190,54 @@ var ts;
          * in that order would be used to write the files
          */
         function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+            var restorePendingEmitOnHandlingNoEmitSuccess = false;
+            var savedAffectedFilesPendingEmit;
+            var savedAffectedFilesPendingEmitKind;
+            var savedAffectedFilesPendingEmitIndex;
+            // Backup and restore affected pendings emit state for non emit Builder if noEmitOnError is enabled and emitBuildInfo could be written in case there are errors
+            // This ensures pending files to emit is updated in tsbuildinfo
+            // Note that when there are no errors, emit proceeds as if everything is emitted as it is callers reponsibility to write the files to disk if at all (because its builder that doesnt track files to emit)
+            if (kind !== BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram &&
+                !targetSourceFile &&
+                !ts.outFile(state.compilerOptions) &&
+                !state.compilerOptions.noEmit &&
+                state.compilerOptions.noEmitOnError) {
+                restorePendingEmitOnHandlingNoEmitSuccess = true;
+                savedAffectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice();
+                savedAffectedFilesPendingEmitKind = state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind);
+                savedAffectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex;
+            }
             if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
                 assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile);
-                var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, writeFile, cancellationToken);
-                if (result)
-                    return result;
-                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
-                    };
+            }
+            var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, writeFile, cancellationToken);
+            if (result)
+                return result;
+            if (restorePendingEmitOnHandlingNoEmitSuccess) {
+                state.affectedFilesPendingEmit = savedAffectedFilesPendingEmit;
+                state.affectedFilesPendingEmitKind = savedAffectedFilesPendingEmitKind;
+                state.affectedFilesPendingEmitIndex = savedAffectedFilesPendingEmitIndex;
+            }
+            // Emit only affected files if using builder for emit
+            if (!targetSourceFile && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                // 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.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
@@ -106743,7 +109257,8 @@ var ts;
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
                 // Add file to affected file pending emit to handle for later emit time
-                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                // Apart for emit builder do this for tsbuildinfo, do this for non emit builder when noEmit is set as tsbuildinfo is written and reused between emitters
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram || state.compilerOptions.noEmit || state.compilerOptions.noEmitOnError) {
                     addToAffectedFilesPendingEmit(state, affected.resolvedPath, 1 /* Full */);
                 }
                 // Get diagnostics for the affected file if its not ignored
@@ -107457,8 +109972,8 @@ var ts;
             if (!resolutions)
                 return false;
             var invalidated = false;
-            for (var _i = 0, resolutions_2 = resolutions; _i < resolutions_2.length; _i++) {
-                var resolution = resolutions_2[_i];
+            for (var _i = 0, resolutions_1 = resolutions; _i < resolutions_1.length; _i++) {
+                var resolution = resolutions_1[_i];
                 if (resolution.isInvalidated || !canInvalidate(resolution))
                     continue;
                 resolution.isInvalidated = invalidated = true;
@@ -107670,14 +110185,14 @@ var ts;
         function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
-            return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
-            return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
-                getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, host, compilerOptions); }) ||
+                getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
         function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
@@ -107688,8 +110203,46 @@ var ts;
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
             var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             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); });
+            var importedFileIsInNodeModules = ts.some(modulePaths, function (p) { return p.isInNodeModules; });
+            // Module specifier priority:
+            //   1. "Bare package specifiers" (e.g. "@foo/bar") resulting from a path through node_modules to a package.json's "types" entry
+            //   2. Specifiers generated using "paths" from tsconfig
+            //   3. Non-relative specfiers resulting from a path through node_modules (e.g. "@foo/bar/path/to/file")
+            //   4. Relative paths
+            var nodeModulesSpecifiers;
+            var pathsSpecifiers;
+            var relativeSpecifiers;
+            for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
+                var modulePath = modulePaths_1[_i];
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, host, compilerOptions);
+                nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
+                if (specifier && modulePath.isRedirect) {
+                    // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
+                    // not "@foo/bar/path/to/file"). No other specifier will be this good, so stop looking.
+                    return nodeModulesSpecifiers;
+                }
+                if (!specifier && !modulePath.isRedirect) {
+                    var local = getLocalModuleSpecifier(modulePath.path, info, compilerOptions, host, preferences);
+                    if (ts.pathIsBareSpecifier(local)) {
+                        pathsSpecifiers = ts.append(pathsSpecifiers, local);
+                    }
+                    else if (!importedFileIsInNodeModules || modulePath.isInNodeModules) {
+                        // Why this extra conditional, not just an `else`? If some path to the file contained
+                        // 'node_modules', but we can't create a non-relative specifier (e.g. "@foo/bar/path/to/file"),
+                        // that means we had to go through a *sibling's* node_modules, not one we can access directly.
+                        // If some path to the file was in node_modules but another was not, this likely indicates that
+                        // we have a monorepo structure with symlinks. In this case, the non-node_modules path is
+                        // probably the realpath, e.g. "../bar/path/to/file", but a relative path to another package
+                        // in a monorepo is probably not portable. So, the module specifier we actually go with will be
+                        // the relative path through node_modules, so that the declaration emitter can produce a
+                        // portability error. (See declarationEmitReexportedSymlinkReference3)
+                        relativeSpecifiers = ts.append(relativeSpecifiers, local);
+                    }
+                }
+            }
+            return (pathsSpecifiers === null || pathsSpecifiers === void 0 ? void 0 : pathsSpecifiers.length) ? pathsSpecifiers :
+                (nodeModulesSpecifiers === null || nodeModulesSpecifiers === void 0 ? void 0 : nodeModulesSpecifiers.length) ? nodeModulesSpecifiers :
+                    ts.Debug.checkDefined(relativeSpecifiers);
         }
         moduleSpecifiers.getModuleSpecifiers = getModuleSpecifiers;
         // importingSourceFileName is separate because getEditsForFileRename may need to specify an updated path
@@ -107698,22 +110251,26 @@ var ts;
             var sourceDirectory = ts.getDirectoryPath(importingSourceFileName);
             return { getCanonicalFileName: getCanonicalFileName, sourceDirectory: sourceDirectory };
         }
-        function getLocalModuleSpecifier(moduleFileName, _a, compilerOptions, _b) {
+        function getLocalModuleSpecifier(moduleFileName, _a, compilerOptions, host, _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, ending, compilerOptions) ||
                 removeExtensionAndIndexPostFix(ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions);
-            if (!baseUrl || relativePreference === 0 /* Relative */) {
+            if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
                 return relativePath;
             }
-            var relativeToBaseUrl = getRelativePathIfInDirectory(moduleFileName, baseUrl, getCanonicalFileName);
+            var baseDirectory = ts.getPathsBasePath(compilerOptions, host) || baseUrl;
+            var relativeToBaseUrl = getRelativePathIfInDirectory(moduleFileName, baseDirectory, 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;
+            var nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths;
+            if (!nonRelative) {
+                return relativePath;
+            }
             if (relativePreference === 1 /* NonRelative */) {
                 return nonRelative;
             }
@@ -107742,8 +110299,8 @@ var ts;
             var match = str.match(/\//g);
             return match ? match.length : 0;
         }
-        function comparePathsByNumberOfDirectorySeparators(a, b) {
-            return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
+        function comparePathsByRedirectAndNumberOfDirectorySeparators(a, b) {
+            return ts.compareBooleans(b.isRedirect, a.isRedirect) || ts.compareValues(numberOfDirectorySeparators(a.path), numberOfDirectorySeparators(b.path));
         }
         function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
             var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
@@ -107753,34 +110310,36 @@ var ts;
             var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
-                var result_13 = ts.forEach(targets, cb);
-                if (result_13)
-                    return result_13;
+                var result_15 = ts.forEach(targets, function (p) { return cb(p, referenceRedirect === p); });
+                if (result_15)
+                    return result_15;
             }
             var links = host.getSymlinkCache
                 ? host.getSymlinkCache()
                 : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var symlinkedDirectories = links.getSymlinkedDirectories();
-            var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
+            var useCaseSensitiveFileNames = !host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames();
             var result = symlinkedDirectories && ts.forEachEntry(symlinkedDirectories, function (resolved, path) {
                 if (resolved === false)
                     return undefined;
                 if (ts.startsWithDirectory(importingFileName, resolved.realPath, getCanonicalFileName)) {
                     return undefined; // Don't want to a package to globally import from itself
                 }
-                var target = ts.find(targets, function (t) { return compareStrings(t.slice(0, resolved.real.length), resolved.real) === 0 /* EqualTo */; });
-                if (target === undefined)
-                    return undefined;
-                var relative = ts.getRelativePathFromDirectory(resolved.real, target, getCanonicalFileName);
-                var option = ts.resolvePath(path, relative);
-                if (!host.fileExists || host.fileExists(option)) {
-                    var result_14 = cb(option);
-                    if (result_14)
-                        return result_14;
-                }
+                return ts.forEach(targets, function (target) {
+                    if (!ts.containsPath(resolved.real, target, !useCaseSensitiveFileNames)) {
+                        return;
+                    }
+                    var relative = ts.getRelativePathFromDirectory(resolved.real, target, getCanonicalFileName);
+                    var option = ts.resolvePath(path, relative);
+                    if (!host.fileExists || host.fileExists(option)) {
+                        var result_16 = cb(option, target === referenceRedirect);
+                        if (result_16)
+                            return result_16;
+                    }
+                });
             });
             return result ||
-                (preferSymlinks ? ts.forEach(targets, cb) : undefined);
+                (preferSymlinks ? ts.forEach(targets, function (p) { return cb(p, p === referenceRedirect); }) : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
         /**
@@ -107793,28 +110352,27 @@ var ts;
             var allFileNames = new ts.Map();
             var importedFileFromNodeModules = false;
             forEachFileNameOfModule(importingFileName, importedFileName, host, 
-            /*preferSymlinks*/ true, function (path) {
-                // dont return value, so we collect everything
-                allFileNames.set(path, getCanonicalFileName(path));
-                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
+            /*preferSymlinks*/ true, function (path, isRedirect) {
+                var isInNodeModules = ts.pathContainsNodeModules(path);
+                allFileNames.set(path, { path: getCanonicalFileName(path), isRedirect: isRedirect, isInNodeModules: isInNodeModules });
+                importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules;
+                // don't return value, so we collect everything
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_23 = function (directory) {
+            var _loop_24 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
-                allFileNames.forEach(function (canonicalFileName, fileName) {
-                    if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        // If the importedFile is from node modules, use only paths in node_modules folder as option
-                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
-                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
-                        }
+                allFileNames.forEach(function (_a, fileName) {
+                    var path = _a.path, isRedirect = _a.isRedirect, isInNodeModules = _a.isInNodeModules;
+                    if (ts.startsWith(path, directoryStart)) {
+                        (pathsInDirectory || (pathsInDirectory = [])).push({ path: fileName, isRedirect: isRedirect, isInNodeModules: isInNodeModules });
                         allFileNames.delete(fileName);
                     }
                 });
                 if (pathsInDirectory) {
                     if (pathsInDirectory.length > 1) {
-                        pathsInDirectory.sort(comparePathsByNumberOfDirectorySeparators);
+                        pathsInDirectory.sort(comparePathsByRedirectAndNumberOfDirectorySeparators);
                     }
                     sortedPaths.push.apply(sortedPaths, pathsInDirectory);
                 }
@@ -107826,7 +110384,7 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_8 = _loop_23(directory);
+                var state_8 = _loop_24(directory);
                 directory = out_directory_1;
                 if (state_8 === "break")
                     break;
@@ -107834,7 +110392,7 @@ var ts;
             if (allFileNames.size) {
                 var remainingPaths = ts.arrayFrom(allFileNames.values());
                 if (remainingPaths.length > 1)
-                    remainingPaths.sort(comparePathsByNumberOfDirectorySeparators);
+                    remainingPaths.sort(comparePathsByRedirectAndNumberOfDirectorySeparators);
                 sortedPaths.push.apply(sortedPaths, remainingPaths);
             }
             return sortedPaths;
@@ -107879,37 +110437,43 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(moduleFileName, _a, host, options, packageNameOnly) {
-            var getCanonicalFileName = _a.getCanonicalFileName, sourceDirectory = _a.sourceDirectory;
+        function tryGetModuleNameAsNodeModule(_a, _b, host, options, packageNameOnly) {
+            var path = _a.path, isRedirect = _a.isRedirect;
+            var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
                 return undefined;
             }
-            var parts = getNodeModulePathParts(moduleFileName);
+            var parts = getNodeModulePathParts(path);
             if (!parts) {
                 return undefined;
             }
             // Simplify the full file path to something that can be resolved by Node.
-            var moduleSpecifier = moduleFileName;
+            var moduleSpecifier = path;
+            var isPackageRootPath = false;
             if (!packageNameOnly) {
                 var packageRootIndex = parts.packageRootIndex;
                 var moduleFileNameForExtensionless = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
-                    var _b = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _b.moduleFileToTry, packageRootPath = _b.packageRootPath;
+                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath;
                     if (packageRootPath) {
                         moduleSpecifier = packageRootPath;
+                        isPackageRootPath = true;
                         break;
                     }
                     if (!moduleFileNameForExtensionless)
                         moduleFileNameForExtensionless = moduleFileToTry;
                     // try with next level of directory
-                    packageRootIndex = moduleFileName.indexOf(ts.directorySeparator, packageRootIndex + 1);
+                    packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
                         moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
                         break;
                     }
                 }
             }
+            if (isRedirect && !isPackageRootPath) {
+                return undefined;
+            }
             var globalTypingsCacheLocation = host.getGlobalTypingsCacheLocation && host.getGlobalTypingsCacheLocation();
             // 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.
@@ -107923,16 +110487,16 @@ var ts;
             // 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 tryDirectoryWithPackageJson(packageRootIndex) {
-                var packageRootPath = moduleFileName.substring(0, packageRootIndex);
+                var packageRootPath = path.substring(0, packageRootIndex);
                 var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
-                var moduleFileToTry = moduleFileName;
+                var moduleFileToTry = path;
                 if (host.fileExists(packageJsonPath)) {
                     var packageJsonContent = JSON.parse(host.readFile(packageJsonPath));
                     var versionPaths = packageJsonContent.typesVersions
                         ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
                         : undefined;
                     if (versionPaths) {
-                        var subModuleName = moduleFileName.slice(packageRootPath.length + 1);
+                        var subModuleName = path.slice(packageRootPath.length + 1);
                         var fromPaths = tryGetModuleNameFromPaths(ts.removeFileExtension(subModuleName), removeExtensionAndIndexPostFix(subModuleName, 0 /* Minimal */, options), versionPaths.paths);
                         if (fromPaths !== undefined) {
                             moduleFileToTry = ts.combinePaths(packageRootPath, fromPaths);
@@ -108336,7 +110900,7 @@ var ts;
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
     function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
-        var computeHash = host.createHash || ts.generateDjb2Hash;
+        var computeHash = ts.maybeBind(host, host.createHash) || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
@@ -108344,7 +110908,7 @@ var ts;
             }
             var result = originalGetSourceFile.call.apply(originalGetSourceFile, __spreadArrays([compilerHost], args));
             if (result) {
-                result.version = computeHash.call(host, result.text);
+                result.version = computeHash(result.text);
             }
             return result;
         };
@@ -108863,7 +111427,7 @@ var ts;
         }
         function reloadFileNamesFromConfigFile() {
             writeLog("Reloading new file names and options");
-            var result = ts.getFileNamesFromConfigSpecs(configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), compilerOptions, parseConfigFileHost);
+            var result = ts.getFileNamesFromConfigSpecs(configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), compilerOptions, parseConfigFileHost, extraFileExtensions);
             if (ts.updateErrorForNoInputFiles(result, ts.getNormalizedAbsolutePath(configFileName, currentDirectory), configFileSpecs, configFileParsingDiagnostics, canConfigFileJsonReportNoInputFiles)) {
                 hasChangedConfigFileParsingErrors = true;
             }
@@ -108949,6 +111513,7 @@ var ts;
                     fileOrDirectoryPath: fileOrDirectoryPath,
                     configFileName: configFileName,
                     configFileSpecs: configFileSpecs,
+                    extraFileExtensions: extraFileExtensions,
                     options: compilerOptions,
                     program: getCurrentBuilderProgram(),
                     currentDirectory: currentDirectory,
@@ -110537,7 +113102,7 @@ var ts;
         function nowString() {
             // E.g. "12:34:56.789"
             var d = new Date();
-            return d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds() + "." + d.getMilliseconds();
+            return ts.padLeft(d.getHours().toString(), 2, "0") + ":" + ts.padLeft(d.getMinutes().toString(), 2, "0") + ":" + ts.padLeft(d.getSeconds().toString(), 2, "0") + "." + ts.padLeft(d.getMilliseconds().toString(), 3, "0");
         }
         server.nowString = nowString;
     })(server = ts.server || (ts.server = {}));
@@ -110647,7 +113212,9 @@ var ts;
                 var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
                 getTypingNamesFromPackagesFolder(nodeModulesPath, filesToWatch);
             });
-            getTypingNamesFromSourceFileNames(fileNames);
+            if (!typeAcquisition.disableFilenameBasedTypeAcquisition) {
+                getTypingNamesFromSourceFileNames(fileNames);
+            }
             // add typings for unresolved imports
             if (unresolvedImports) {
                 var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
@@ -110908,6 +113475,11 @@ var ts;
     })(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {}));
     /* @internal */
     ts.emptyOptions = {};
+    var SemanticClassificationFormat;
+    (function (SemanticClassificationFormat) {
+        SemanticClassificationFormat["Original"] = "original";
+        SemanticClassificationFormat["TwentyTwenty"] = "2020";
+    })(SemanticClassificationFormat = ts.SemanticClassificationFormat || (ts.SemanticClassificationFormat = {}));
     var HighlightSpanKind;
     (function (HighlightSpanKind) {
         HighlightSpanKind["none"] = "none";
@@ -111181,37 +113753,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 246 /* VariableDeclaration */:
+            case 249 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 159 /* Parameter */:
-            case 195 /* BindingElement */:
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 285 /* PropertyAssignment */:
-            case 286 /* ShorthandPropertyAssignment */:
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
-            case 284 /* CatchClause */:
-            case 277 /* JsxAttribute */:
+            case 160 /* Parameter */:
+            case 198 /* BindingElement */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 288 /* PropertyAssignment */:
+            case 289 /* ShorthandPropertyAssignment */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
+            case 287 /* CatchClause */:
+            case 280 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 158 /* TypeParameter */:
-            case 250 /* InterfaceDeclaration */:
-            case 251 /* TypeAliasDeclaration */:
-            case 176 /* TypeLiteral */:
+            case 159 /* TypeParameter */:
+            case 253 /* InterfaceDeclaration */:
+            case 254 /* TypeAliasDeclaration */:
+            case 177 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 327 /* JSDocTypedefTag */:
+            case 331 /* 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 288 /* EnumMember */:
-            case 249 /* ClassDeclaration */:
+            case 291 /* EnumMember */:
+            case 252 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -111221,16 +113793,16 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 252 /* EnumDeclaration */:
-            case 261 /* NamedImports */:
-            case 262 /* ImportSpecifier */:
-            case 257 /* ImportEqualsDeclaration */:
-            case 258 /* ImportDeclaration */:
-            case 263 /* ExportAssignment */:
-            case 264 /* ExportDeclaration */:
+            case 255 /* EnumDeclaration */:
+            case 264 /* NamedImports */:
+            case 265 /* ImportSpecifier */:
+            case 260 /* ImportEqualsDeclaration */:
+            case 261 /* ImportDeclaration */:
+            case 266 /* ExportAssignment */:
+            case 267 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 294 /* SourceFile */:
+            case 297 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
@@ -111238,13 +113810,13 @@ var ts;
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
         node = getAdjustedReferenceLocation(node);
-        if (node.kind === 294 /* SourceFile */) {
+        if (node.kind === 297 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 263 /* ExportAssignment */
-            || node.parent.kind === 269 /* ExternalModuleReference */
-            || node.parent.kind === 262 /* ImportSpecifier */
-            || node.parent.kind === 259 /* ImportClause */
+        else if (node.parent.kind === 266 /* ExportAssignment */
+            || node.parent.kind === 272 /* ExternalModuleReference */
+            || node.parent.kind === 265 /* ImportSpecifier */
+            || node.parent.kind === 262 /* ImportClause */
             || ts.isImportEqualsDeclaration(node.parent) && node === node.parent.name) {
             return 7 /* All */;
         }
@@ -111254,6 +113826,9 @@ var ts;
         else if (ts.isDeclarationName(node)) {
             return getMeaningFromDeclaration(node.parent);
         }
+        else if (ts.isEntityName(node) && ts.isJSDocNameReference(node.parent)) {
+            return 7 /* All */;
+        }
         else if (isTypeReference(node)) {
             return 2 /* Type */;
         }
@@ -111277,11 +113852,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 156 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 257 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 157 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 260 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 156 /* QualifiedName */) {
+        while (node.parent.kind === 157 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -111293,27 +113868,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 156 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 156 /* QualifiedName */) {
+        if (root.parent.kind === 157 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 157 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 172 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 173 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 198 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 198 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 201 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 201 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 220 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 283 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 223 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 286 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 249 /* ClassDeclaration */ && root.parent.parent.token === 116 /* ImplementsKeyword */) ||
-                (decl.kind === 250 /* InterfaceDeclaration */ && root.parent.parent.token === 93 /* ExtendsKeyword */);
+            return (decl.kind === 252 /* ClassDeclaration */ && root.parent.parent.token === 116 /* ImplementsKeyword */) ||
+                (decl.kind === 253 /* InterfaceDeclaration */ && root.parent.parent.token === 93 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -111324,15 +113899,15 @@ var ts;
         switch (node.kind) {
             case 107 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 186 /* ThisType */:
+            case 187 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 172 /* TypeReference */:
+            case 173 /* TypeReference */:
                 return true;
-            case 192 /* ImportType */:
+            case 195 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 220 /* ExpressionWithTypeArguments */:
+            case 223 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -111399,7 +113974,7 @@ var ts;
     ts.climbPastPropertyOrElementAccess = climbPastPropertyOrElementAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 242 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 245 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -111460,22 +114035,22 @@ var ts;
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 285 /* PropertyAssignment */:
-            case 288 /* EnumMember */:
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 253 /* ModuleDeclaration */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 288 /* PropertyAssignment */:
+            case 291 /* EnumMember */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 256 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 199 /* ElementAccessExpression */:
+            case 202 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 157 /* ComputedPropertyName */:
+            case 158 /* ComputedPropertyName */:
                 return true;
-            case 190 /* LiteralType */:
-                return node.parent.parent.kind === 188 /* IndexedAccessType */;
+            case 191 /* LiteralType */:
+                return node.parent.parent.kind === 189 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -111499,17 +114074,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 294 /* SourceFile */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 253 /* ModuleDeclaration */:
+                case 297 /* SourceFile */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -111517,54 +114092,54 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 294 /* SourceFile */:
+            case 297 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 249 /* ClassDeclaration */:
-            case 218 /* ClassExpression */:
+            case 252 /* ClassDeclaration */:
+            case 221 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 250 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 251 /* TypeAliasDeclaration */:
-            case 320 /* JSDocCallbackTag */:
-            case 327 /* JSDocTypedefTag */:
+            case 253 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 254 /* TypeAliasDeclaration */:
+            case 324 /* JSDocCallbackTag */:
+            case 331 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 252 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 246 /* VariableDeclaration */:
+            case 255 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 249 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 195 /* BindingElement */:
+            case 198 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 206 /* ArrowFunction */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 166 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 167 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
+            case 167 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 168 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 285 /* PropertyAssignment */:
+            case 288 /* PropertyAssignment */:
                 var initializer = node.initializer;
                 return ts.isFunctionLike(initializer) ? "method" /* memberFunctionElement */ : "property" /* memberVariableElement */;
-            case 162 /* PropertyDeclaration */:
-            case 161 /* PropertySignature */:
-            case 286 /* ShorthandPropertyAssignment */:
-            case 287 /* SpreadAssignment */:
+            case 163 /* PropertyDeclaration */:
+            case 162 /* PropertySignature */:
+            case 289 /* ShorthandPropertyAssignment */:
+            case 290 /* SpreadAssignment */:
                 return "property" /* memberVariableElement */;
-            case 170 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 169 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 168 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 165 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 158 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 288 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 159 /* Parameter */: return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 257 /* ImportEqualsDeclaration */:
-            case 262 /* ImportSpecifier */:
-            case 267 /* ExportSpecifier */:
-            case 260 /* NamespaceImport */:
-            case 266 /* NamespaceExport */:
+            case 171 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 170 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 169 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 166 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 159 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 291 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 160 /* Parameter */: return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 260 /* ImportEqualsDeclaration */:
+            case 265 /* ImportSpecifier */:
+            case 270 /* ExportSpecifier */:
+            case 263 /* NamespaceImport */:
+            case 269 /* NamespaceExport */:
                 return "alias" /* alias */;
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -111593,7 +114168,7 @@ var ts;
                 }
             case 78 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
-            case 263 /* ExportAssignment */:
+            case 266 /* ExportAssignment */:
                 var scriptKind = getNodeKind(node.expression);
                 // If the expression didn't come back with something (like it does for an identifiers)
                 return scriptKind === "" /* unknown */ ? "const" /* constElement */ : scriptKind;
@@ -111616,7 +114191,7 @@ var ts;
                 return true;
             case 78 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 159 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 160 /* Parameter */;
             default:
                 return false;
         }
@@ -111681,42 +114256,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 249 /* ClassDeclaration */:
-            case 250 /* InterfaceDeclaration */:
-            case 252 /* EnumDeclaration */:
-            case 197 /* ObjectLiteralExpression */:
-            case 193 /* ObjectBindingPattern */:
-            case 176 /* TypeLiteral */:
-            case 227 /* Block */:
-            case 254 /* ModuleBlock */:
-            case 255 /* CaseBlock */:
-            case 261 /* NamedImports */:
-            case 265 /* NamedExports */:
+            case 252 /* ClassDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 255 /* EnumDeclaration */:
+            case 200 /* ObjectLiteralExpression */:
+            case 196 /* ObjectBindingPattern */:
+            case 177 /* TypeLiteral */:
+            case 230 /* Block */:
+            case 257 /* ModuleBlock */:
+            case 258 /* CaseBlock */:
+            case 264 /* NamedImports */:
+            case 268 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 284 /* CatchClause */:
+            case 287 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 201 /* NewExpression */:
+            case 204 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 200 /* CallExpression */:
-            case 204 /* ParenthesizedExpression */:
-            case 185 /* ParenthesizedType */:
+            case 203 /* CallExpression */:
+            case 207 /* ParenthesizedExpression */:
+            case 186 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 173 /* FunctionType */:
-            case 174 /* ConstructorType */:
+            case 174 /* FunctionType */:
+            case 175 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 165 /* Constructor */:
-            case 166 /* GetAccessor */:
-            case 167 /* SetAccessor */:
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 164 /* MethodDeclaration */:
-            case 163 /* MethodSignature */:
-            case 169 /* ConstructSignature */:
-            case 168 /* CallSignature */:
-            case 206 /* ArrowFunction */:
+            case 166 /* Constructor */:
+            case 167 /* GetAccessor */:
+            case 168 /* SetAccessor */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 165 /* MethodDeclaration */:
+            case 164 /* MethodSignature */:
+            case 170 /* ConstructSignature */:
+            case 169 /* CallSignature */:
+            case 209 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -111726,65 +114301,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 253 /* ModuleDeclaration */:
+            case 256 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 231 /* IfStatement */:
+            case 234 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 230 /* ExpressionStatement */:
+            case 233 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 196 /* ArrayLiteralExpression */:
-            case 194 /* ArrayBindingPattern */:
-            case 199 /* ElementAccessExpression */:
-            case 157 /* ComputedPropertyName */:
-            case 178 /* TupleType */:
+            case 199 /* ArrayLiteralExpression */:
+            case 197 /* ArrayBindingPattern */:
+            case 202 /* ElementAccessExpression */:
+            case 158 /* ComputedPropertyName */:
+            case 179 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 170 /* IndexSignature */:
+            case 171 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 281 /* CaseClause */:
-            case 282 /* DefaultClause */:
+            case 284 /* CaseClause */:
+            case 285 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 234 /* ForStatement */:
-            case 235 /* ForInStatement */:
-            case 236 /* ForOfStatement */:
-            case 233 /* WhileStatement */:
+            case 237 /* ForStatement */:
+            case 238 /* ForInStatement */:
+            case 239 /* ForOfStatement */:
+            case 236 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 232 /* DoStatement */:
+            case 235 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
                 return hasChildOfKind(n, 114 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 175 /* TypeQuery */:
+            case 176 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 208 /* TypeOfExpression */:
-            case 207 /* DeleteExpression */:
-            case 209 /* VoidExpression */:
-            case 216 /* YieldExpression */:
-            case 217 /* SpreadElement */:
+            case 211 /* TypeOfExpression */:
+            case 210 /* DeleteExpression */:
+            case 212 /* VoidExpression */:
+            case 219 /* YieldExpression */:
+            case 220 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 202 /* TaggedTemplateExpression */:
+            case 205 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 215 /* TemplateExpression */:
+            case 218 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 225 /* TemplateSpan */:
+            case 228 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 264 /* ExportDeclaration */:
-            case 258 /* ImportDeclaration */:
+            case 267 /* ExportDeclaration */:
+            case 261 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 211 /* PrefixUnaryExpression */:
+            case 214 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 213 /* BinaryExpression */:
+            case 216 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 214 /* ConditionalExpression */:
+            case 217 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -111891,11 +114466,11 @@ var ts;
     function getAdjustedLocationForDeclaration(node, forRename) {
         if (!forRename) {
             switch (node.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     return getAdjustedLocationForClass(node);
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
                     return getAdjustedLocationForFunction(node);
             }
         }
@@ -111990,11 +114565,11 @@ var ts;
                 node.kind === 97 /* FunctionKeyword */ ? ts.isFunctionDeclaration(parent) || ts.isFunctionExpression(node) :
                     node.kind === 117 /* InterfaceKeyword */ ? ts.isInterfaceDeclaration(parent) :
                         node.kind === 91 /* EnumKeyword */ ? ts.isEnumDeclaration(parent) :
-                            node.kind === 148 /* TypeKeyword */ ? ts.isTypeAliasDeclaration(parent) :
-                                node.kind === 139 /* NamespaceKeyword */ || node.kind === 138 /* ModuleKeyword */ ? ts.isModuleDeclaration(parent) :
+                            node.kind === 149 /* TypeKeyword */ ? ts.isTypeAliasDeclaration(parent) :
+                                node.kind === 140 /* NamespaceKeyword */ || node.kind === 139 /* ModuleKeyword */ ? ts.isModuleDeclaration(parent) :
                                     node.kind === 99 /* ImportKeyword */ ? ts.isImportEqualsDeclaration(parent) :
                                         node.kind === 134 /* GetKeyword */ ? ts.isGetAccessorDeclaration(parent) :
-                                            node.kind === 145 /* SetKeyword */ && ts.isSetAccessorDeclaration(parent)) {
+                                            node.kind === 146 /* SetKeyword */ && ts.isSetAccessorDeclaration(parent)) {
             var location = getAdjustedLocationForDeclaration(parent, forRename);
             if (location) {
                 return location;
@@ -112008,7 +114583,7 @@ var ts;
                 return decl.name;
             }
         }
-        if (node.kind === 148 /* TypeKeyword */) {
+        if (node.kind === 149 /* TypeKeyword */) {
             // import /**/type [|name|] from ...;
             // import /**/type { [|name|] } from ...;
             // import /**/type { propertyName as [|name|] } from ...;
@@ -112075,12 +114650,12 @@ var ts;
             }
         }
         // import name = /**/require("[|module|]");
-        if (node.kind === 142 /* RequireKeyword */ && ts.isExternalModuleReference(parent)) {
+        if (node.kind === 143 /* RequireKeyword */ && ts.isExternalModuleReference(parent)) {
             return parent.expression;
         }
         // import ... /**/from "[|module|]";
         // export ... /**/from "[|module|]";
-        if (node.kind === 152 /* FromKeyword */ && (ts.isImportDeclaration(parent) || ts.isExportDeclaration(parent)) && parent.moduleSpecifier) {
+        if (node.kind === 153 /* FromKeyword */ && (ts.isImportDeclaration(parent) || ts.isExportDeclaration(parent)) && parent.moduleSpecifier) {
             return parent.moduleSpecifier;
         }
         // class ... /**/extends [|name|] ...
@@ -112113,12 +114688,12 @@ var ts;
             return parent.name;
         }
         // /**/keyof [|T|]
-        if (node.kind === 137 /* KeyOfKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 137 /* KeyOfKeyword */ &&
+        if (node.kind === 138 /* KeyOfKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 138 /* KeyOfKeyword */ &&
             ts.isTypeReferenceNode(parent.type)) {
             return parent.type.typeName;
         }
         // /**/readonly [|name|][]
-        if (node.kind === 141 /* ReadonlyKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 141 /* ReadonlyKeyword */ &&
+        if (node.kind === 142 /* ReadonlyKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 142 /* ReadonlyKeyword */ &&
             ts.isArrayTypeNode(parent.type) && ts.isTypeReferenceNode(parent.type.elementType)) {
             return parent.type.elementType.typeName;
         }
@@ -112155,7 +114730,7 @@ var ts;
             // for (... /**/in [|name|])
             // for (... /**/of [|name|])
             if (node.kind === 100 /* InKeyword */ && ts.isForInStatement(parent) ||
-                node.kind === 155 /* OfKeyword */ && ts.isForOfStatement(parent)) {
+                node.kind === 156 /* OfKeyword */ && ts.isForOfStatement(parent)) {
                 return ts.skipOuterExpressions(parent.expression);
             }
         }
@@ -112273,7 +114848,21 @@ var ts;
                 return n;
             }
             var children = n.getChildren(sourceFile);
-            for (var i = 0; i < children.length; i++) {
+            var i = ts.binarySearchKey(children, position, function (_, i) { return i; }, function (middle, _) {
+                // This last callback is more of a selector than a comparator -
+                // `EqualTo` causes the `middle` result to be returned
+                // `GreaterThan` causes recursion on the left of the middle
+                // `LessThan` causes recursion on the right of the middle
+                if (position < children[middle].end) {
+                    // first element whose end position is greater than the input position
+                    if (!children[middle - 1] || position >= children[middle - 1].end) {
+                        return 0 /* EqualTo */;
+                    }
+                    return 1 /* GreaterThan */;
+                }
+                return -1 /* LessThan */;
+            });
+            if (i >= 0 && children[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:
@@ -112296,7 +114885,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 294 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 297 /* 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.
@@ -112314,6 +114903,9 @@ var ts;
             return n;
         }
         var children = n.getChildren(sourceFile);
+        if (children.length === 0) {
+            return n;
+        }
         var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length, sourceFile);
         return candidate && findRightmostToken(candidate, sourceFile);
     }
@@ -112366,17 +114958,17 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 280 /* JsxExpression */) {
+        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 283 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 280 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 283 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 273 /* JsxClosingElement */) {
+        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 276 /* JsxClosingElement */) {
             return true;
         }
         return false;
@@ -112407,7 +114999,7 @@ var ts;
     function isInsideJsxElement(sourceFile, position) {
         function isInsideJsxElementTraversal(node) {
             while (node) {
-                if (node.kind >= 271 /* JsxSelfClosingElement */ && node.kind <= 280 /* JsxExpression */
+                if (node.kind >= 274 /* JsxSelfClosingElement */ && node.kind <= 283 /* JsxExpression */
                     || node.kind === 11 /* JsxText */
                     || node.kind === 29 /* LessThanToken */
                     || node.kind === 31 /* GreaterThanToken */
@@ -112417,7 +115009,7 @@ var ts;
                     || node.kind === 43 /* SlashToken */) {
                     node = node.parent;
                 }
-                else if (node.kind === 270 /* JsxElement */) {
+                else if (node.kind === 273 /* JsxElement */) {
                     if (position > node.getStart(sourceFile))
                         return true;
                     node = node.parent;
@@ -112544,7 +115136,7 @@ var ts;
                 // falls through
                 case 111 /* TypeOfKeyword */:
                 case 93 /* ExtendsKeyword */:
-                case 137 /* KeyOfKeyword */:
+                case 138 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 51 /* BarToken */:
                 case 57 /* QuestionToken */:
@@ -112601,16 +115193,16 @@ var ts;
             result.push("deprecated" /* deprecatedModifier */);
         if (node.flags & 8388608 /* Ambient */)
             result.push("declare" /* ambientModifier */);
-        if (node.kind === 263 /* ExportAssignment */)
+        if (node.kind === 266 /* ExportAssignment */)
             result.push("export" /* exportedModifier */);
         return result.length > 0 ? result.join(",") : "" /* none */;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 172 /* TypeReference */ || node.kind === 200 /* CallExpression */) {
+        if (node.kind === 173 /* TypeReference */ || node.kind === 203 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 249 /* ClassDeclaration */ || node.kind === 250 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 252 /* ClassDeclaration */ || node.kind === 253 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -112655,18 +115247,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 196 /* ArrayLiteralExpression */ ||
-            node.kind === 197 /* ObjectLiteralExpression */) {
+        if (node.kind === 199 /* ArrayLiteralExpression */ ||
+            node.kind === 200 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 213 /* BinaryExpression */ &&
+            if (node.parent.kind === 216 /* BinaryExpression */ &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 62 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 236 /* ForOfStatement */ &&
+            if (node.parent.kind === 239 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -112674,7 +115266,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 285 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 288 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -112738,29 +115330,29 @@ var ts;
     ts.typeKeywords = [
         128 /* AnyKeyword */,
         127 /* AssertsKeyword */,
-        154 /* BigIntKeyword */,
+        155 /* BigIntKeyword */,
         131 /* BooleanKeyword */,
         94 /* FalseKeyword */,
-        137 /* KeyOfKeyword */,
-        140 /* NeverKeyword */,
+        138 /* KeyOfKeyword */,
+        141 /* NeverKeyword */,
         103 /* NullKeyword */,
-        143 /* NumberKeyword */,
-        144 /* ObjectKeyword */,
-        141 /* ReadonlyKeyword */,
-        146 /* StringKeyword */,
-        147 /* SymbolKeyword */,
+        144 /* NumberKeyword */,
+        145 /* ObjectKeyword */,
+        142 /* ReadonlyKeyword */,
+        147 /* StringKeyword */,
+        148 /* SymbolKeyword */,
         109 /* TrueKeyword */,
         113 /* VoidKeyword */,
-        149 /* UndefinedKeyword */,
-        150 /* UniqueKeyword */,
-        151 /* UnknownKeyword */,
+        150 /* UndefinedKeyword */,
+        151 /* UniqueKeyword */,
+        152 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
     }
     ts.isTypeKeyword = isTypeKeyword;
     function isTypeKeywordToken(node) {
-        return node.kind === 148 /* TypeKeyword */;
+        return node.kind === 149 /* TypeKeyword */;
     }
     ts.isTypeKeywordToken = isTypeKeywordToken;
     /** True if the symbol is for an external module, as opposed to a namespace. */
@@ -112793,7 +115385,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 157 /* ComputedPropertyName */
+        return name.kind === 158 /* 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.isPrivateIdentifier(name) ? ts.idText(name) : ts.getTextOfIdentifierOrLiteral(name);
@@ -112824,7 +115416,7 @@ var ts;
             getSourceFiles: function () { return program.getSourceFiles(); },
             redirectTargetsMap: program.redirectTargetsMap,
             getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
-            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); }
         };
     }
     ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
@@ -112862,7 +115454,9 @@ var ts;
             return preferences.quotePreference === "single" ? 0 /* Single */ : 1 /* Double */;
         }
         else {
-            var firstModuleSpecifier = sourceFile.imports && ts.find(sourceFile.imports, ts.isStringLiteral);
+            // ignore synthetic import added when importHelpers: true
+            var firstModuleSpecifier = sourceFile.imports &&
+                ts.find(sourceFile.imports, function (n) { return ts.isStringLiteral(n) && !ts.nodeIsSynthesized(n.parent); });
             return firstModuleSpecifier ? quotePreferenceFromString(firstModuleSpecifier, sourceFile) : 1 /* Double */;
         }
     }
@@ -112954,7 +115548,7 @@ var ts;
     ts.findModifier = findModifier;
     function insertImports(changes, sourceFile, imports, blankLineBetween) {
         var decl = ts.isArray(imports) ? imports[0] : imports;
-        var importKindPredicate = decl.kind === 229 /* VariableStatement */ ? ts.isRequireVariableStatement : ts.isAnyImportSyntax;
+        var importKindPredicate = decl.kind === 232 /* VariableStatement */ ? ts.isRequireVariableStatement : ts.isAnyImportSyntax;
         var existingImportStatements = ts.filter(sourceFile.statements, importKindPredicate);
         var sortedNewImports = ts.isArray(imports) ? ts.stableSort(imports, ts.OrganizeImports.compareImportsOrRequireStatements) : [imports];
         if (!existingImportStatements.length) {
@@ -112965,7 +115559,10 @@ var ts;
                 var newImport = sortedNewImports_1[_i];
                 var insertionIndex = ts.OrganizeImports.getImportDeclarationInsertionIndex(existingImportStatements, newImport);
                 if (insertionIndex === 0) {
-                    changes.insertNodeBefore(sourceFile, existingImportStatements[0], newImport, /*blankLineBetween*/ false);
+                    // If the first import is top-of-file, insert after the leading comment which is likely the header.
+                    var options = existingImportStatements[0] === sourceFile.statements[0] ?
+                        { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude } : {};
+                    changes.insertNodeBefore(sourceFile, existingImportStatements[0], newImport, /*blankLineBetween*/ false, options);
                 }
                 else {
                     var prevImport = existingImportStatements[insertionIndex - 1];
@@ -113029,7 +115626,7 @@ var ts;
     // Display-part writer helpers
     // #region
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 159 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 160 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -113310,36 +115907,22 @@ var ts;
         return clone;
     }
     ts.getSynthesizedDeepClone = getSynthesizedDeepClone;
-    function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
-        if (includeTrivia === void 0) { includeTrivia = true; }
-        var clone;
-        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.setOriginalNode(ts.factory.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer), node);
-            }
+    function getSynthesizedDeepCloneWithReplacements(node, includeTrivia, replaceNode) {
+        var clone = replaceNode(node);
+        if (clone) {
+            ts.setOriginalNode(clone, node);
         }
-        else if (renameMap && checker && ts.isIdentifier(node)) {
-            var symbol = checker.getSymbolAtLocation(node);
-            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
-            if (renameInfo) {
-                clone = ts.setOriginalNode(ts.factory.createIdentifier(renameInfo.text), node);
-            }
-        }
-        if (!clone) {
-            clone = getSynthesizedDeepCloneWorker(node, renameMap, checker, callback);
+        else {
+            clone = getSynthesizedDeepCloneWorker(node, replaceNode);
         }
         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.getSynthesizedDeepCloneWithReplacements = getSynthesizedDeepCloneWithReplacements;
+    function getSynthesizedDeepCloneWorker(node, replaceNode) {
+        var visited = replaceNode ?
+            ts.visitEachChild(node, function (n) { return getSynthesizedDeepCloneWithReplacements(n, /*includeTrivia*/ true, replaceNode); }, ts.nullTransformationContext) :
             ts.visitEachChild(node, getSynthesizedDeepClone, ts.nullTransformationContext);
         if (visited === node) {
             // This only happens for leaf nodes - internal nodes always see their children change.
@@ -113353,15 +115936,16 @@ var ts;
         // 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.factory.createNodeArray(nodes.map(function (n) { return getSynthesizedDeepClone(n, includeTrivia); }), nodes.hasTrailingComma);
     }
     ts.getSynthesizedDeepClones = getSynthesizedDeepClones;
+    function getSynthesizedDeepClonesWithReplacements(nodes, includeTrivia, replaceNode) {
+        return ts.factory.createNodeArray(nodes.map(function (n) { return getSynthesizedDeepCloneWithReplacements(n, includeTrivia, replaceNode); }), nodes.hasTrailingComma);
+    }
+    ts.getSynthesizedDeepClonesWithReplacements = getSynthesizedDeepClonesWithReplacements;
     /**
      * Sets EmitFlags to suppress leading and trailing trivia on the node.
      */
@@ -113506,35 +116090,26 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 201 /* NewExpression */:
+            case 204 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 213 /* BinaryExpression */: {
+            case 216 /* 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 281 /* CaseClause */:
+            case 284 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
         }
     }
     ts.getContextualTypeFromParent = getContextualTypeFromParent;
-    function quote(text, preferences) {
+    function quote(sourceFile, preferences, text) {
         // Editors can pass in undefined or empty string - we want to infer the preference in those cases.
-        var quotePreference = preferences.quotePreference || "auto";
+        var quotePreference = getQuotePreference(sourceFile, preferences);
         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 "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
-            default:
-                return ts.Debug.assertNever(quotePreference);
-        }
+        return quotePreference === 0 /* Single */ ? "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'" : quoted;
     }
     ts.quote = quote;
     function isEqualityOperatorKind(kind) {
@@ -113553,8 +116128,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 215 /* TemplateExpression */:
-            case 202 /* TaggedTemplateExpression */:
+            case 218 /* TemplateExpression */:
+            case 205 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -113574,7 +116149,7 @@ var ts;
         var checker = program.getTypeChecker();
         var typeIsAccessible = true;
         var notAccessible = function () { typeIsAccessible = false; };
-        var res = checker.typeToTypeNode(type, enclosingScope, /*flags*/ undefined, {
+        var res = checker.typeToTypeNode(type, enclosingScope, 1 /* NoTruncation */, {
             trackSymbol: function (symbol, declaration, meaning) {
                 typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === 0 /* Accessible */;
             },
@@ -113587,41 +116162,41 @@ var ts;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
     function syntaxRequiresTrailingCommaOrSemicolonOrASI(kind) {
-        return kind === 168 /* CallSignature */
-            || kind === 169 /* ConstructSignature */
-            || kind === 170 /* IndexSignature */
-            || kind === 161 /* PropertySignature */
-            || kind === 163 /* MethodSignature */;
+        return kind === 169 /* CallSignature */
+            || kind === 170 /* ConstructSignature */
+            || kind === 171 /* IndexSignature */
+            || kind === 162 /* PropertySignature */
+            || kind === 164 /* MethodSignature */;
     }
     ts.syntaxRequiresTrailingCommaOrSemicolonOrASI = syntaxRequiresTrailingCommaOrSemicolonOrASI;
     function syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI(kind) {
-        return kind === 248 /* FunctionDeclaration */
-            || kind === 165 /* Constructor */
-            || kind === 164 /* MethodDeclaration */
-            || kind === 166 /* GetAccessor */
-            || kind === 167 /* SetAccessor */;
+        return kind === 251 /* FunctionDeclaration */
+            || kind === 166 /* Constructor */
+            || kind === 165 /* MethodDeclaration */
+            || kind === 167 /* GetAccessor */
+            || kind === 168 /* SetAccessor */;
     }
     ts.syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI = syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI;
     function syntaxRequiresTrailingModuleBlockOrSemicolonOrASI(kind) {
-        return kind === 253 /* ModuleDeclaration */;
+        return kind === 256 /* ModuleDeclaration */;
     }
     ts.syntaxRequiresTrailingModuleBlockOrSemicolonOrASI = syntaxRequiresTrailingModuleBlockOrSemicolonOrASI;
     function syntaxRequiresTrailingSemicolonOrASI(kind) {
-        return kind === 229 /* VariableStatement */
-            || kind === 230 /* ExpressionStatement */
-            || kind === 232 /* DoStatement */
-            || kind === 237 /* ContinueStatement */
-            || kind === 238 /* BreakStatement */
-            || kind === 239 /* ReturnStatement */
-            || kind === 243 /* ThrowStatement */
-            || kind === 245 /* DebuggerStatement */
-            || kind === 162 /* PropertyDeclaration */
-            || kind === 251 /* TypeAliasDeclaration */
-            || kind === 258 /* ImportDeclaration */
-            || kind === 257 /* ImportEqualsDeclaration */
-            || kind === 264 /* ExportDeclaration */
-            || kind === 256 /* NamespaceExportDeclaration */
-            || kind === 263 /* ExportAssignment */;
+        return kind === 232 /* VariableStatement */
+            || kind === 233 /* ExpressionStatement */
+            || kind === 235 /* DoStatement */
+            || kind === 240 /* ContinueStatement */
+            || kind === 241 /* BreakStatement */
+            || kind === 242 /* ReturnStatement */
+            || kind === 246 /* ThrowStatement */
+            || kind === 248 /* DebuggerStatement */
+            || kind === 163 /* PropertyDeclaration */
+            || kind === 254 /* TypeAliasDeclaration */
+            || kind === 261 /* ImportDeclaration */
+            || kind === 260 /* ImportEqualsDeclaration */
+            || kind === 267 /* ExportDeclaration */
+            || kind === 259 /* NamespaceExportDeclaration */
+            || kind === 266 /* ExportAssignment */;
     }
     ts.syntaxRequiresTrailingSemicolonOrASI = syntaxRequiresTrailingSemicolonOrASI;
     ts.syntaxMayBeASICandidate = ts.or(syntaxRequiresTrailingCommaOrSemicolonOrASI, syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI, syntaxRequiresTrailingModuleBlockOrSemicolonOrASI, syntaxRequiresTrailingSemicolonOrASI);
@@ -113651,7 +116226,7 @@ var ts;
             return false;
         }
         // See comment in parser’s `parseDoStatement`
-        if (node.kind === 232 /* DoStatement */) {
+        if (node.kind === 235 /* DoStatement */) {
             return true;
         }
         var topNode = ts.findAncestor(node, function (ancestor) { return !ancestor.parent; });
@@ -114070,10 +116645,10 @@ var ts;
                         }
                         break;
                     case 128 /* AnyKeyword */:
-                    case 146 /* StringKeyword */:
-                    case 143 /* NumberKeyword */:
+                    case 147 /* StringKeyword */:
+                    case 144 /* NumberKeyword */:
                     case 131 /* BooleanKeyword */:
-                    case 147 /* SymbolKeyword */:
+                    case 148 /* 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,
@@ -114263,7 +116838,7 @@ var ts;
         }
         switch (keyword2) {
             case 134 /* GetKeyword */:
-            case 145 /* SetKeyword */:
+            case 146 /* SetKeyword */:
             case 132 /* ConstructorKeyword */:
             case 123 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
@@ -114408,13 +116983,13 @@ 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 253 /* ModuleDeclaration */:
-            case 249 /* ClassDeclaration */:
-            case 250 /* InterfaceDeclaration */:
-            case 248 /* FunctionDeclaration */:
-            case 218 /* ClassExpression */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
+            case 256 /* ModuleDeclaration */:
+            case 252 /* ClassDeclaration */:
+            case 253 /* InterfaceDeclaration */:
+            case 251 /* FunctionDeclaration */:
+            case 221 /* ClassExpression */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -114634,18 +117209,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 322 /* JSDocParameterTag */:
+                        case 326 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 326 /* JSDocTemplateTag */:
+                        case 330 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 325 /* JSDocTypeTag */:
+                        case 329 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 323 /* JSDocReturnTag */:
+                        case 327 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -114796,22 +117371,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 272 /* JsxOpeningElement */:
+                case 275 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 273 /* JsxClosingElement */:
+                case 276 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 271 /* JsxSelfClosingElement */:
+                case 274 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 277 /* JsxAttribute */:
+                case 280 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -114840,17 +117415,17 @@ var ts;
                     var parent = token.parent;
                     if (tokenKind === 62 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 246 /* VariableDeclaration */ ||
-                            parent.kind === 162 /* PropertyDeclaration */ ||
-                            parent.kind === 159 /* Parameter */ ||
-                            parent.kind === 277 /* JsxAttribute */) {
+                        if (parent.kind === 249 /* VariableDeclaration */ ||
+                            parent.kind === 163 /* PropertyDeclaration */ ||
+                            parent.kind === 160 /* Parameter */ ||
+                            parent.kind === 280 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 213 /* BinaryExpression */ ||
-                        parent.kind === 211 /* PrefixUnaryExpression */ ||
-                        parent.kind === 212 /* PostfixUnaryExpression */ ||
-                        parent.kind === 214 /* ConditionalExpression */) {
+                    if (parent.kind === 216 /* BinaryExpression */ ||
+                        parent.kind === 214 /* PrefixUnaryExpression */ ||
+                        parent.kind === 215 /* PostfixUnaryExpression */ ||
+                        parent.kind === 217 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -114863,7 +117438,7 @@ var ts;
                 return 25 /* bigintLiteral */;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
-                return token && token.parent.kind === 277 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token && token.parent.kind === 280 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -114879,32 +117454,32 @@ var ts;
             else if (tokenKind === 78 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 249 /* ClassDeclaration */:
+                        case 252 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 158 /* TypeParameter */:
+                        case 159 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 250 /* InterfaceDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 252 /* EnumDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 253 /* ModuleDeclaration */:
+                        case 256 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 159 /* Parameter */:
+                        case 160 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -114933,6 +117508,254 @@ var ts;
     }
     ts.getEncodedSyntacticClassifications = getEncodedSyntacticClassifications;
 })(ts || (ts = {}));
+/** @internal */
+var ts;
+(function (ts) {
+    var classifier;
+    (function (classifier) {
+        var v2020;
+        (function (v2020) {
+            var TokenEncodingConsts;
+            (function (TokenEncodingConsts) {
+                TokenEncodingConsts[TokenEncodingConsts["typeOffset"] = 8] = "typeOffset";
+                TokenEncodingConsts[TokenEncodingConsts["modifierMask"] = 255] = "modifierMask";
+            })(TokenEncodingConsts = v2020.TokenEncodingConsts || (v2020.TokenEncodingConsts = {}));
+            var TokenType;
+            (function (TokenType) {
+                TokenType[TokenType["class"] = 0] = "class";
+                TokenType[TokenType["enum"] = 1] = "enum";
+                TokenType[TokenType["interface"] = 2] = "interface";
+                TokenType[TokenType["namespace"] = 3] = "namespace";
+                TokenType[TokenType["typeParameter"] = 4] = "typeParameter";
+                TokenType[TokenType["type"] = 5] = "type";
+                TokenType[TokenType["parameter"] = 6] = "parameter";
+                TokenType[TokenType["variable"] = 7] = "variable";
+                TokenType[TokenType["enumMember"] = 8] = "enumMember";
+                TokenType[TokenType["property"] = 9] = "property";
+                TokenType[TokenType["function"] = 10] = "function";
+                TokenType[TokenType["member"] = 11] = "member";
+            })(TokenType = v2020.TokenType || (v2020.TokenType = {}));
+            var TokenModifier;
+            (function (TokenModifier) {
+                TokenModifier[TokenModifier["declaration"] = 0] = "declaration";
+                TokenModifier[TokenModifier["static"] = 1] = "static";
+                TokenModifier[TokenModifier["async"] = 2] = "async";
+                TokenModifier[TokenModifier["readonly"] = 3] = "readonly";
+                TokenModifier[TokenModifier["defaultLibrary"] = 4] = "defaultLibrary";
+                TokenModifier[TokenModifier["local"] = 5] = "local";
+            })(TokenModifier = v2020.TokenModifier || (v2020.TokenModifier = {}));
+            /** This is mainly used internally for testing */
+            function getSemanticClassifications(program, cancellationToken, sourceFile, span) {
+                var classifications = getEncodedSemanticClassifications(program, cancellationToken, sourceFile, span);
+                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: dense[i + 2]
+                    });
+                }
+                return result;
+            }
+            v2020.getSemanticClassifications = getSemanticClassifications;
+            function getEncodedSemanticClassifications(program, cancellationToken, sourceFile, span) {
+                return {
+                    spans: getSemanticTokens(program, sourceFile, span, cancellationToken),
+                    endOfLineState: 0 /* None */
+                };
+            }
+            v2020.getEncodedSemanticClassifications = getEncodedSemanticClassifications;
+            function getSemanticTokens(program, sourceFile, span, cancellationToken) {
+                var resultTokens = [];
+                var collector = function (node, typeIdx, modifierSet) {
+                    resultTokens.push(node.getStart(sourceFile), node.getWidth(sourceFile), ((typeIdx + 1) << 8 /* typeOffset */) + modifierSet);
+                };
+                if (program && sourceFile) {
+                    collectTokens(program, sourceFile, span, collector, cancellationToken);
+                }
+                return resultTokens;
+            }
+            function collectTokens(program, sourceFile, span, collector, cancellationToken) {
+                var typeChecker = program.getTypeChecker();
+                var inJSXElement = false;
+                function visit(node) {
+                    switch (node.kind) {
+                        case 256 /* ModuleDeclaration */:
+                        case 252 /* ClassDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
+                        case 251 /* FunctionDeclaration */:
+                        case 221 /* ClassExpression */:
+                        case 208 /* FunctionExpression */:
+                        case 209 /* ArrowFunction */:
+                            cancellationToken.throwIfCancellationRequested();
+                    }
+                    if (!node || !ts.textSpanIntersectsWith(span, node.pos, node.getFullWidth()) || node.getFullWidth() === 0) {
+                        return;
+                    }
+                    var prevInJSXElement = inJSXElement;
+                    if (ts.isJsxElement(node) || ts.isJsxSelfClosingElement(node)) {
+                        inJSXElement = true;
+                    }
+                    if (ts.isJsxExpression(node)) {
+                        inJSXElement = false;
+                    }
+                    if (ts.isIdentifier(node) && !inJSXElement && !inImportClause(node)) {
+                        var symbol = typeChecker.getSymbolAtLocation(node);
+                        if (symbol) {
+                            if (symbol.flags & 2097152 /* Alias */) {
+                                symbol = typeChecker.getAliasedSymbol(symbol);
+                            }
+                            var typeIdx = classifySymbol(symbol, ts.getMeaningFromLocation(node));
+                            if (typeIdx !== undefined) {
+                                var modifierSet = 0;
+                                if (node.parent) {
+                                    var parentIsDeclaration = (ts.isBindingElement(node.parent) || tokenFromDeclarationMapping.get(node.parent.kind) === typeIdx);
+                                    if (parentIsDeclaration && node.parent.name === node) {
+                                        modifierSet = 1 << 0 /* declaration */;
+                                    }
+                                }
+                                // property declaration in constructor
+                                if (typeIdx === 6 /* parameter */ && isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                                    typeIdx = 9 /* property */;
+                                }
+                                typeIdx = reclassifyByType(typeChecker, node, typeIdx);
+                                var decl = symbol.valueDeclaration;
+                                if (decl) {
+                                    var modifiers = ts.getCombinedModifierFlags(decl);
+                                    var nodeFlags = ts.getCombinedNodeFlags(decl);
+                                    if (modifiers & 32 /* Static */) {
+                                        modifierSet |= 1 << 1 /* static */;
+                                    }
+                                    if (modifiers & 256 /* Async */) {
+                                        modifierSet |= 1 << 2 /* async */;
+                                    }
+                                    if (typeIdx !== 0 /* class */ && typeIdx !== 2 /* interface */) {
+                                        if ((modifiers & 64 /* Readonly */) || (nodeFlags & 2 /* Const */) || (symbol.getFlags() & 8 /* EnumMember */)) {
+                                            modifierSet |= 1 << 3 /* readonly */;
+                                        }
+                                    }
+                                    if ((typeIdx === 7 /* variable */ || typeIdx === 10 /* function */) && isLocalDeclaration(decl, sourceFile)) {
+                                        modifierSet |= 1 << 5 /* local */;
+                                    }
+                                    if (program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
+                                        modifierSet |= 1 << 4 /* defaultLibrary */;
+                                    }
+                                }
+                                else if (symbol.declarations && symbol.declarations.some(function (d) { return program.isSourceFileDefaultLibrary(d.getSourceFile()); })) {
+                                    modifierSet |= 1 << 4 /* defaultLibrary */;
+                                }
+                                collector(node, typeIdx, modifierSet);
+                            }
+                        }
+                    }
+                    ts.forEachChild(node, visit);
+                    inJSXElement = prevInJSXElement;
+                }
+                visit(sourceFile);
+            }
+            function classifySymbol(symbol, meaning) {
+                var flags = symbol.getFlags();
+                if (flags & 32 /* Class */) {
+                    return 0 /* class */;
+                }
+                else if (flags & 384 /* Enum */) {
+                    return 1 /* enum */;
+                }
+                else if (flags & 524288 /* TypeAlias */) {
+                    return 5 /* type */;
+                }
+                else if (flags & 64 /* Interface */) {
+                    if (meaning & 2 /* Type */) {
+                        return 2 /* interface */;
+                    }
+                }
+                else if (flags & 262144 /* TypeParameter */) {
+                    return 4 /* typeParameter */;
+                }
+                var decl = symbol.valueDeclaration || symbol.declarations && symbol.declarations[0];
+                if (decl && ts.isBindingElement(decl)) {
+                    decl = getDeclarationForBindingElement(decl);
+                }
+                return decl && tokenFromDeclarationMapping.get(decl.kind);
+            }
+            function reclassifyByType(typeChecker, node, typeIdx) {
+                // type based classifications
+                if (typeIdx === 7 /* variable */ || typeIdx === 9 /* property */ || typeIdx === 6 /* parameter */) {
+                    var type_1 = typeChecker.getTypeAtLocation(node);
+                    if (type_1) {
+                        var test = function (condition) {
+                            return condition(type_1) || type_1.isUnion() && type_1.types.some(condition);
+                        };
+                        if (typeIdx !== 6 /* parameter */ && test(function (t) { return t.getConstructSignatures().length > 0; })) {
+                            return 0 /* class */;
+                        }
+                        if (test(function (t) { return t.getCallSignatures().length > 0; }) && !test(function (t) { return t.getProperties().length > 0; }) || isExpressionInCallExpression(node)) {
+                            return typeIdx === 9 /* property */ ? 11 /* member */ : 10 /* function */;
+                        }
+                    }
+                }
+                return typeIdx;
+            }
+            function isLocalDeclaration(decl, sourceFile) {
+                if (ts.isBindingElement(decl)) {
+                    decl = getDeclarationForBindingElement(decl);
+                }
+                if (ts.isVariableDeclaration(decl)) {
+                    return (!ts.isSourceFile(decl.parent.parent.parent) || ts.isCatchClause(decl.parent)) && decl.getSourceFile() === sourceFile;
+                }
+                else if (ts.isFunctionDeclaration(decl)) {
+                    return !ts.isSourceFile(decl.parent) && decl.getSourceFile() === sourceFile;
+                }
+                return false;
+            }
+            function getDeclarationForBindingElement(element) {
+                while (true) {
+                    if (ts.isBindingElement(element.parent.parent)) {
+                        element = element.parent.parent;
+                    }
+                    else {
+                        return element.parent.parent;
+                    }
+                }
+            }
+            function inImportClause(node) {
+                var parent = node.parent;
+                return parent && (ts.isImportClause(parent) || ts.isImportSpecifier(parent) || ts.isNamespaceImport(parent));
+            }
+            function isExpressionInCallExpression(node) {
+                while (isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                return ts.isCallExpression(node.parent) && node.parent.expression === node;
+            }
+            function isRightSideOfQualifiedNameOrPropertyAccess(node) {
+                return (ts.isQualifiedName(node.parent) && node.parent.right === node) || (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node);
+            }
+            var tokenFromDeclarationMapping = new ts.Map([
+                [249 /* VariableDeclaration */, 7 /* variable */],
+                [160 /* Parameter */, 6 /* parameter */],
+                [163 /* PropertyDeclaration */, 9 /* property */],
+                [256 /* ModuleDeclaration */, 3 /* namespace */],
+                [255 /* EnumDeclaration */, 1 /* enum */],
+                [291 /* EnumMember */, 8 /* enumMember */],
+                [252 /* ClassDeclaration */, 0 /* class */],
+                [165 /* MethodDeclaration */, 11 /* member */],
+                [251 /* FunctionDeclaration */, 10 /* function */],
+                [208 /* FunctionExpression */, 10 /* function */],
+                [164 /* MethodSignature */, 11 /* member */],
+                [167 /* GetAccessor */, 9 /* property */],
+                [168 /* SetAccessor */, 9 /* property */],
+                [162 /* PropertySignature */, 9 /* property */],
+                [253 /* InterfaceDeclaration */, 2 /* interface */],
+                [254 /* TypeAliasDeclaration */, 5 /* type */],
+                [159 /* TypeParameter */, 4 /* typeParameter */],
+                [288 /* PropertyAssignment */, 9 /* property */],
+                [289 /* ShorthandPropertyAssignment */, 9 /* property */]
+            ]);
+        })(v2020 = classifier.v2020 || (classifier.v2020 = {}));
+    })(classifier = ts.classifier || (ts.classifier = {}));
+})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -114957,23 +117780,24 @@ var ts;
                 if (completion === undefined) {
                     return undefined;
                 }
+                var optionalReplacementSpan = ts.createTextSpanFromStringLiteralLikeContent(contextToken);
                 switch (completion.kind) {
                     case 0 /* Paths */:
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
                         Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, contextToken, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
-                        return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
+                        return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan: optionalReplacementSpan, entries: entries };
                     }
                     case 2 /* Types */: {
                         var entries = completion.types.map(function (type) { return ({
                             name: type.value,
                             kindModifiers: "" /* none */,
                             kind: "string" /* string */,
-                            sortText: "0",
+                            sortText: Completions.SortText.LocationPriority,
                             replacementSpan: ts.getReplacementSpanForContextToken(contextToken)
                         }); });
-                        return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: completion.isNewIdentifier, entries: entries };
+                        return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: completion.isNewIdentifier, optionalReplacementSpan: optionalReplacementSpan, entries: entries };
                     }
                     default:
                         return ts.Debug.assertNever(completion);
@@ -115032,33 +117856,46 @@ var ts;
                 StringLiteralCompletionKind[StringLiteralCompletionKind["Types"] = 2] = "Types";
             })(StringLiteralCompletionKind || (StringLiteralCompletionKind = {}));
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
-                var parent = node.parent;
+                var parent = walkUpParentheses(node.parent);
                 switch (parent.kind) {
-                    case 190 /* LiteralType */:
-                        switch (parent.parent.kind) {
-                            case 172 /* TypeReference */:
-                                return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 188 /* IndexedAccessType */:
+                    case 191 /* LiteralType */: {
+                        var grandParent = walkUpParentheses(parent.parent);
+                        switch (grandParent.kind) {
+                            case 173 /* TypeReference */: {
+                                var typeReference_1 = grandParent;
+                                var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === typeReference_1; });
+                                if (typeArgument) {
+                                    return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
+                                }
+                                return undefined;
+                            }
+                            case 189 /* 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 192 /* ImportType */:
+                                var _a = grandParent, indexType = _a.indexType, objectType = _a.objectType;
+                                if (!ts.rangeContainsPosition(indexType, position)) {
+                                    return undefined;
+                                }
+                                return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
+                            case 195 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 181 /* UnionType */: {
-                                if (!ts.isTypeReferenceNode(parent.parent.parent))
+                            case 182 /* UnionType */: {
+                                if (!ts.isTypeReferenceNode(grandParent.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); });
+                                }
+                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent);
+                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
                                 return { kind: 2 /* Types */, types: types, isNewIdentifier: false };
                             }
                             default:
                                 return undefined;
                         }
-                    case 285 /* PropertyAssignment */:
+                    }
+                    case 288 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -115075,9 +117912,9 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 199 /* ElementAccessExpression */: {
-                        var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
-                        if (node === argumentExpression) {
+                    case 202 /* ElementAccessExpression */: {
+                        var _b = parent, expression = _b.expression, argumentExpression = _b.argumentExpression;
+                        if (node === ts.skipParentheses(argumentExpression)) {
                             // Get all names of properties on the expression
                             // i.e. interface A {
                             //      'prop1': string
@@ -115088,8 +117925,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 200 /* CallExpression */:
-                    case 201 /* NewExpression */:
+                    case 203 /* CallExpression */:
+                    case 204 /* 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
@@ -115098,9 +117935,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 258 /* ImportDeclaration */:
-                    case 264 /* ExportDeclaration */:
-                    case 269 /* ExternalModuleReference */:
+                    case 261 /* ImportDeclaration */:
+                    case 267 /* ExportDeclaration */:
+                    case 272 /* 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*/");
@@ -115117,6 +117954,16 @@ var ts;
                     return { kind: 2 /* Types */, types: getStringLiteralTypes(ts.getContextualTypeFromParent(node, typeChecker)), isNewIdentifier: false };
                 }
             }
+            function walkUpParentheses(node) {
+                switch (node.kind) {
+                    case 186 /* ParenthesizedType */:
+                        return ts.walkUpParenthesizedTypes(node);
+                    case 207 /* ParenthesizedExpression */:
+                        return ts.walkUpParenthesizedExpressions(node);
+                    default:
+                        return node;
+                }
+            }
             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;
@@ -115563,13 +118410,14 @@ var ts;
     (function (Completions) {
         var SortText;
         (function (SortText) {
-            SortText["LocationPriority"] = "0";
-            SortText["OptionalMember"] = "1";
-            SortText["MemberDeclaredBySpreadAssignment"] = "2";
-            SortText["SuggestedClassMembers"] = "3";
-            SortText["GlobalsOrKeywords"] = "4";
-            SortText["AutoImportSuggestions"] = "5";
-            SortText["JavascriptIdentifiers"] = "6";
+            SortText["LocalDeclarationPriority"] = "0";
+            SortText["LocationPriority"] = "1";
+            SortText["OptionalMember"] = "2";
+            SortText["MemberDeclaredBySpreadAssignment"] = "3";
+            SortText["SuggestedClassMembers"] = "4";
+            SortText["GlobalsOrKeywords"] = "5";
+            SortText["AutoImportSuggestions"] = "6";
+            SortText["JavascriptIdentifiers"] = "7";
         })(SortText = Completions.SortText || (Completions.SortText = {}));
         /**
          * Special values for `CompletionInfo['source']` used to disambiguate
@@ -115716,6 +118564,10 @@ var ts;
         function jsdocCompletionInfo(entries) {
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
+        function getOptionalReplacementSpan(location) {
+            // StringLiteralLike locations are handled separately in stringCompletions.ts
+            return (location === null || location === void 0 ? void 0 : location.kind) === 78 /* Identifier */ ? ts.createTextSpanFromNode(location) : undefined;
+        }
         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, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
@@ -115733,7 +118585,7 @@ var ts;
                     kindModifiers: undefined,
                     sortText: SortText.LocationPriority,
                 };
-                return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
+                return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, optionalReplacementSpan: getOptionalReplacementSpan(location), entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
@@ -115759,9 +118611,15 @@ var ts;
             }
             for (var _b = 0, literals_1 = literals; _b < literals_1.length; _b++) {
                 var literal = literals_1[_b];
-                entries.push(createCompletionEntryForLiteral(literal, preferences));
+                entries.push(createCompletionEntryForLiteral(sourceFile, preferences, literal));
             }
-            return { isGlobalCompletion: isInSnippetScope, isMemberCompletion: isMemberCompletionKind(completionKind), isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
+            return {
+                isGlobalCompletion: isInSnippetScope,
+                isMemberCompletion: isMemberCompletionKind(completionKind),
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                optionalReplacementSpan: getOptionalReplacementSpan(location),
+                entries: entries
+            };
         }
         function isUncheckedFile(sourceFile, compilerOptions) {
             return ts.isSourceFileJS(sourceFile) && !ts.isCheckJsEnabledForFile(sourceFile, compilerOptions);
@@ -115795,12 +118653,12 @@ var ts;
                 }
             });
         }
-        function completionNameForLiteral(literal, preferences) {
+        function completionNameForLiteral(sourceFile, preferences, literal) {
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" :
-                ts.isString(literal) ? ts.quote(literal, preferences) : JSON.stringify(literal);
+                ts.isString(literal) ? ts.quote(sourceFile, preferences, literal) : JSON.stringify(literal);
         }
-        function createCompletionEntryForLiteral(literal, preferences) {
-            return { name: completionNameForLiteral(literal, preferences), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
+        function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
+            return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
         function createCompletionEntry(symbol, sortText, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
@@ -115809,13 +118667,13 @@ var ts;
             var useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
             if (origin && originIsThisType(origin)) {
                 insertText = needsConvertPropertyAccess
-                    ? "this" + (insertQuestionDot ? "?." : "") + "[" + quotePropertyName(name, preferences) + "]"
+                    ? "this" + (insertQuestionDot ? "?." : "") + "[" + quotePropertyName(sourceFile, preferences, name) + "]"
                     : "this" + (insertQuestionDot ? "?." : ".") + 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 ((useBraces || insertQuestionDot) && propertyAccessToConvert) {
-                insertText = useBraces ? needsConvertPropertyAccess ? "[" + quotePropertyName(name, preferences) + "]" : "[" + name + "]" : name;
+                insertText = useBraces ? needsConvertPropertyAccess ? "[" + quotePropertyName(sourceFile, preferences, name) + "]" : "[" + name + "]" : name;
                 if (insertQuestionDot || propertyAccessToConvert.questionDotToken) {
                     insertText = "?." + insertText;
                 }
@@ -115871,11 +118729,11 @@ var ts;
                 isPackageJsonImport: originIsPackageJsonImport(origin) || undefined,
             };
         }
-        function quotePropertyName(name, preferences) {
+        function quotePropertyName(sourceFile, preferences, name) {
             if (/^\d+$/.test(name)) {
                 return name;
             }
-            return ts.quote(name, preferences);
+            return ts.quote(sourceFile, preferences, name);
         }
         function isRecommendedCompletionMatch(localSymbol, recommendedCompletion, checker) {
             return localSymbol === recommendedCompletion ||
@@ -115966,7 +118824,7 @@ var ts;
                 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, isTypeOnlyLocation = completionData.isTypeOnlyLocation;
-            var literal = ts.find(literals, function (l) { return completionNameForLiteral(l, preferences) === entryId.name; });
+            var literal = ts.find(literals, function (l) { return completionNameForLiteral(sourceFile, preferences, l) === entryId.name; });
             if (literal !== undefined)
                 return { type: "literal", literal: literal };
             // Find the symbol with the matching entry name.
@@ -116012,7 +118870,7 @@ var ts;
                 }
                 case "literal": {
                     var literal = symbolCompletion.literal;
-                    return createSimpleDetails(completionNameForLiteral(literal, preferences), "string" /* string */, typeof literal === "string" ? ts.SymbolDisplayPartKind.stringLiteral : ts.SymbolDisplayPartKind.numericLiteral);
+                    return createSimpleDetails(completionNameForLiteral(sourceFile, preferences, 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.
@@ -116084,11 +118942,11 @@ var ts;
                     return ts.getContextualTypeFromParent(previousToken, checker);
                 case 62 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 246 /* VariableDeclaration */:
+                        case 249 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 213 /* BinaryExpression */:
+                        case 216 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 277 /* JsxAttribute */:
+                        case 280 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
@@ -116098,7 +118956,7 @@ var ts;
                 case 81 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 270 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 273 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo ?
@@ -116117,7 +118975,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 === 294 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 297 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId, host) {
             var typeChecker = program.getTypeChecker();
@@ -116168,11 +119026,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 301 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 328 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 333 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -116225,7 +119083,7 @@ var ts;
                     isRightOfDot = contextToken.kind === 24 /* DotToken */;
                     isRightOfQuestionDot = contextToken.kind === 28 /* QuestionDotToken */;
                     switch (parent.kind) {
-                        case 198 /* PropertyAccessExpression */:
+                        case 201 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
                             if ((ts.isCallExpression(node) || ts.isFunctionLike(node)) &&
@@ -116238,14 +119096,14 @@ var ts;
                                 return undefined;
                             }
                             break;
-                        case 156 /* QualifiedName */:
+                        case 157 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 253 /* ModuleDeclaration */:
+                        case 256 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 192 /* ImportType */:
-                        case 223 /* MetaProperty */:
+                        case 195 /* ImportType */:
+                        case 226 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -116258,7 +119116,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 === 198 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 201 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -116266,39 +119124,51 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 31 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 270 /* JsxElement */ || currentToken.parent.kind === 272 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 273 /* JsxElement */ || currentToken.parent.kind === 275 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 43 /* SlashToken */:
-                                if (currentToken.parent.kind === 271 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 274 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 273 /* JsxClosingElement */:
+                        case 276 /* JsxClosingElement */:
                             if (contextToken.kind === 43 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 213 /* BinaryExpression */:
+                        case 216 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 271 /* JsxSelfClosingElement */:
-                        case 270 /* JsxElement */:
-                        case 272 /* JsxOpeningElement */:
+                        case 274 /* JsxSelfClosingElement */:
+                        case 273 /* JsxElement */:
+                        case 275 /* JsxOpeningElement */:
                             isJsxIdentifierExpected = true;
                             if (contextToken.kind === 29 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 277 /* JsxAttribute */:
+                        case 283 /* JsxExpression */:
+                            // For `<div foo={true} [||] ></div>`, `parent` will be `{true}` and `previousToken` will be `}`
+                            if (previousToken.kind === 19 /* CloseBraceToken */ && currentToken.kind === 31 /* GreaterThanToken */) {
+                                isJsxIdentifierExpected = true;
+                            }
+                            break;
+                        case 280 /* JsxAttribute */:
+                            // For `<div className="x" [||] ></div>`, `parent` will be JsxAttribute and `previousToken` will be its initializer
+                            if (parent.initializer === previousToken &&
+                                previousToken.end < position) {
+                                isJsxIdentifierExpected = true;
+                                break;
+                            }
                             switch (previousToken.kind) {
                                 case 62 /* EqualsToken */:
                                     isJsxInitializer = true;
@@ -116380,11 +119250,11 @@ var ts;
             };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 322 /* JSDocParameterTag */:
-                    case 328 /* JSDocPropertyTag */:
-                    case 323 /* JSDocReturnTag */:
-                    case 325 /* JSDocTypeTag */:
-                    case 327 /* JSDocTypedefTag */:
+                    case 326 /* JSDocParameterTag */:
+                    case 333 /* JSDocPropertyTag */:
+                    case 327 /* JSDocReturnTag */:
+                    case 329 /* JSDocTypeTag */:
+                    case 331 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -116400,7 +119270,7 @@ var ts;
                     || ts.isPartOfTypeNode(node.parent)
                     || ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
                 var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
-                if (ts.isEntityName(node) || isImportType) {
+                if (ts.isEntityName(node) || isImportType || ts.isPropertyAccessExpression(node)) {
                     var isNamespaceName = ts.isModuleDeclaration(node.parent);
                     if (isNamespaceName)
                         isNewIdentifierLocation = true;
@@ -116429,7 +119299,7 @@ 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 !== 294 /* SourceFile */ && d.kind !== 253 /* ModuleDeclaration */ && d.kind !== 252 /* EnumDeclaration */; })) {
+                                symbol.declarations.some(function (d) { return d.kind !== 297 /* SourceFile */ && d.kind !== 256 /* ModuleDeclaration */ && d.kind !== 255 /* EnumDeclaration */; })) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, node).getNonOptionalType();
                                 var insertQuestionDot = false;
                                 if (type.isNullableType()) {
@@ -116476,7 +119346,7 @@ var ts;
                 if (isRightOfQuestionDot && ts.some(type.getCallSignatures())) {
                     isNewIdentifierLocation = true;
                 }
-                var propertyAccess = node.kind === 192 /* ImportType */ ? node : node.parent;
+                var propertyAccess = node.kind === 195 /* ImportType */ ? node : node.parent;
                 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
@@ -116489,7 +119359,7 @@ var ts;
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
                         if (typeChecker.isValidPropertyAccessForCompletions(propertyAccess, type, symbol)) {
-                            addPropertySymbol(symbol, /*insertAwait*/ false, insertQuestionDot);
+                            addPropertySymbol(symbol, /* insertAwait */ false, insertQuestionDot);
                         }
                     }
                 }
@@ -116525,13 +119395,20 @@ var ts;
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
                         addSymbolOriginInfo(symbol);
+                        addSymbolSortInfo(symbol);
                         symbols.push(symbol);
                     }
                 }
                 else {
                     addSymbolOriginInfo(symbol);
+                    addSymbolSortInfo(symbol);
                     symbols.push(symbol);
                 }
+                function addSymbolSortInfo(symbol) {
+                    if (isStaticProperty(symbol)) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.LocalDeclarationPriority;
+                    }
+                }
                 function addSymbolOriginInfo(symbol) {
                     if (preferences.includeCompletionsWithInsertText) {
                         if (insertAwait && !symbolToOriginInfoMap[ts.getSymbolId(symbol)]) {
@@ -116633,7 +119510,7 @@ var ts;
                     }
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 294 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 297 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) {
                         for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
@@ -116683,10 +119560,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 294 /* SourceFile */:
-                    case 215 /* TemplateExpression */:
-                    case 280 /* JsxExpression */:
-                    case 227 /* Block */:
+                    case 297 /* SourceFile */:
+                    case 218 /* TemplateExpression */:
+                    case 283 /* JsxExpression */:
+                    case 230 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -116729,27 +119606,27 @@ var ts;
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
                     contextToken.kind === 111 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 175 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    (contextToken.parent.kind === 176 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 58 /* ColonToken */:
-                            return parentKind === 162 /* PropertyDeclaration */ ||
-                                parentKind === 161 /* PropertySignature */ ||
-                                parentKind === 159 /* Parameter */ ||
-                                parentKind === 246 /* VariableDeclaration */ ||
+                            return parentKind === 163 /* PropertyDeclaration */ ||
+                                parentKind === 162 /* PropertySignature */ ||
+                                parentKind === 160 /* Parameter */ ||
+                                parentKind === 249 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
                         case 62 /* EqualsToken */:
-                            return parentKind === 251 /* TypeAliasDeclaration */;
+                            return parentKind === 254 /* TypeAliasDeclaration */;
                         case 126 /* AsKeyword */:
-                            return parentKind === 221 /* AsExpression */;
+                            return parentKind === 224 /* AsExpression */;
                         case 29 /* LessThanToken */:
-                            return parentKind === 172 /* TypeReference */ ||
-                                parentKind === 203 /* TypeAssertionExpression */;
+                            return parentKind === 173 /* TypeReference */ ||
+                                parentKind === 206 /* TypeAssertionExpression */;
                         case 93 /* ExtendsKeyword */:
-                            return parentKind === 158 /* TypeParameter */;
+                            return parentKind === 159 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -116960,7 +119837,7 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 31 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 272 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 275 /* JsxOpeningElement */) {
                         // Two possibilities:
                         //   1. <div>/**/
                         //      - contextToken: GreaterThanToken (before cursor)
@@ -116970,10 +119847,10 @@ var ts;
                         //      - contextToken: GreaterThanToken (before cursor)
                         //      - location: GreaterThanToken (after cursor)
                         //      - same parent (JSXOpeningElement)
-                        return location.parent.kind !== 272 /* JsxOpeningElement */;
+                        return location.parent.kind !== 275 /* JsxOpeningElement */;
                     }
-                    if (contextToken.parent.kind === 273 /* JsxClosingElement */ || contextToken.parent.kind === 271 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 270 /* JsxElement */;
+                    if (contextToken.parent.kind === 276 /* JsxClosingElement */ || contextToken.parent.kind === 274 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 273 /* JsxElement */;
                     }
                 }
                 return false;
@@ -116984,40 +119861,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 200 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 165 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 201 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 196 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 213 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 173 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 203 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 166 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 204 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 199 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 216 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 174 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 200 /* CallExpression */ // func( |
-                                || containingNodeKind === 165 /* Constructor */ // constructor( |
-                                || containingNodeKind === 201 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 204 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 185 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 203 /* CallExpression */ // func( |
+                                || containingNodeKind === 166 /* Constructor */ // constructor( |
+                                || containingNodeKind === 204 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 207 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 186 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 196 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 170 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 157 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 138 /* ModuleKeyword */: // module |
-                        case 139 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 199 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 171 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 158 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 139 /* ModuleKeyword */: // module |
+                        case 140 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 253 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 256 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 249 /* ClassDeclaration */; // class A{ |
+                            return containingNodeKind === 252 /* ClassDeclaration */; // class A{ |
                         case 62 /* EqualsToken */:
-                            return containingNodeKind === 246 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 213 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 249 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 216 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 215 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 218 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 225 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 228 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 122 /* PublicKeyword */:
                         case 120 /* PrivateKeyword */:
                         case 121 /* ProtectedKeyword */:
-                            return containingNodeKind === 162 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 163 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -117044,17 +119921,18 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 197 /* ObjectLiteralExpression */) {
-                    var instantiatedType = typeChecker.getContextualType(objectLikeContainer);
-                    var completionsType = instantiatedType && typeChecker.getContextualType(objectLikeContainer, 4 /* Completions */);
-                    if (!instantiatedType || !completionsType)
+                if (objectLikeContainer.kind === 200 /* ObjectLiteralExpression */) {
+                    var instantiatedType = tryGetObjectLiteralContextualType(objectLikeContainer, typeChecker);
+                    if (instantiatedType === undefined) {
                         return 2 /* Fail */;
-                    isNewIdentifierLocation = ts.hasIndexSignature(instantiatedType || completionsType);
+                    }
+                    var completionsType = typeChecker.getContextualType(objectLikeContainer, 4 /* Completions */);
+                    isNewIdentifierLocation = ts.hasIndexSignature(completionsType || instantiatedType);
                     typeMembers = getPropertiesForObjectExpression(instantiatedType, completionsType, objectLikeContainer, typeChecker);
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 193 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 196 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -117065,12 +119943,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 === 236 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 159 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 239 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 160 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 164 /* MethodDeclaration */ || rootDeclaration.parent.kind === 167 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 165 /* MethodDeclaration */ || rootDeclaration.parent.kind === 168 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -117117,9 +119995,9 @@ var ts;
                 if (!namedImportsOrExports)
                     return 0 /* Continue */;
                 // try to show exported member for imported/re-exported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 261 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 264 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 if (!moduleSpecifier)
-                    return namedImportsOrExports.kind === 261 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */;
+                    return namedImportsOrExports.kind === 264 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -117272,11 +120150,11 @@ var ts;
                         case 30 /* LessThanSlashToken */:
                         case 43 /* SlashToken */:
                         case 78 /* Identifier */:
-                        case 198 /* PropertyAccessExpression */:
-                        case 278 /* JsxAttributes */:
-                        case 277 /* JsxAttribute */:
-                        case 279 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 271 /* JsxSelfClosingElement */ || parent.kind === 272 /* JsxOpeningElement */)) {
+                        case 201 /* PropertyAccessExpression */:
+                        case 281 /* JsxAttributes */:
+                        case 280 /* JsxAttribute */:
+                        case 282 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 274 /* JsxSelfClosingElement */ || parent.kind === 275 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 31 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 43 /* SlashToken */))
@@ -117284,7 +120162,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 277 /* JsxAttribute */) {
+                            else if (parent.kind === 280 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -117296,7 +120174,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 === 277 /* JsxAttribute */) || (parent.kind === 279 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 280 /* JsxAttribute */) || (parent.kind === 282 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -117306,8 +120184,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 280 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 277 /* JsxAttribute */) {
+                                parent.kind === 283 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 280 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -117315,7 +120193,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 279 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 282 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -117335,51 +120213,51 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 246 /* VariableDeclaration */ ||
+                        return containingNodeKind === 249 /* VariableDeclaration */ ||
                             isVariableDeclarationListButNotTypeArgument(contextToken) ||
-                            containingNodeKind === 229 /* VariableStatement */ ||
-                            containingNodeKind === 252 /* EnumDeclaration */ || // enum a { foo, |
+                            containingNodeKind === 232 /* VariableStatement */ ||
+                            containingNodeKind === 255 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 250 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 194 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 251 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 253 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 197 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 254 /* 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 === 194 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 197 /* ArrayBindingPattern */; // var [.|
                     case 58 /* ColonToken */:
-                        return containingNodeKind === 195 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 198 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 194 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 197 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 284 /* CatchClause */ ||
+                        return containingNodeKind === 287 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 252 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 255 /* EnumDeclaration */; // enum a { |
                     case 29 /* LessThanToken */:
-                        return containingNodeKind === 249 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 218 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 250 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 251 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 252 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 221 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 253 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 254 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
                     case 123 /* StaticKeyword */:
-                        return containingNodeKind === 162 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                        return containingNodeKind === 163 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 159 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 194 /* ArrayBindingPattern */); // var [...z|
+                        return containingNodeKind === 160 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 197 /* ArrayBindingPattern */); // var [...z|
                     case 122 /* PublicKeyword */:
                     case 120 /* PrivateKeyword */:
                     case 121 /* ProtectedKeyword */:
-                        return containingNodeKind === 159 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                        return containingNodeKind === 160 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
                     case 126 /* AsKeyword */:
-                        return containingNodeKind === 262 /* ImportSpecifier */ ||
-                            containingNodeKind === 267 /* ExportSpecifier */ ||
-                            containingNodeKind === 260 /* NamespaceImport */;
+                        return containingNodeKind === 265 /* ImportSpecifier */ ||
+                            containingNodeKind === 270 /* ExportSpecifier */ ||
+                            containingNodeKind === 263 /* NamespaceImport */;
                     case 134 /* GetKeyword */:
-                    case 145 /* SetKeyword */:
+                    case 146 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
                     case 83 /* ClassKeyword */:
                     case 91 /* EnumKeyword */:
@@ -117389,7 +120267,7 @@ var ts;
                     case 99 /* ImportKeyword */:
                     case 118 /* LetKeyword */:
                     case 84 /* ConstKeyword */:
-                    case 148 /* TypeKeyword */: // type htm|
+                    case 149 /* TypeKeyword */: // type htm|
                         return true;
                     case 41 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -117436,7 +120314,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 165 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 166 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -117446,7 +120324,7 @@ var ts;
                 return false;
             }
             function isVariableDeclarationListButNotTypeArgument(node) {
-                return node.parent.kind === 247 /* VariableDeclarationList */
+                return node.parent.kind === 250 /* VariableDeclarationList */
                     && !ts.isPossiblyTypeArgumentPosition(node, sourceFile, typeChecker);
             }
             /**
@@ -117464,13 +120342,13 @@ 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 !== 285 /* PropertyAssignment */ &&
-                        m.kind !== 286 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 195 /* BindingElement */ &&
-                        m.kind !== 164 /* MethodDeclaration */ &&
-                        m.kind !== 166 /* GetAccessor */ &&
-                        m.kind !== 167 /* SetAccessor */ &&
-                        m.kind !== 287 /* SpreadAssignment */) {
+                    if (m.kind !== 288 /* PropertyAssignment */ &&
+                        m.kind !== 289 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 198 /* BindingElement */ &&
+                        m.kind !== 165 /* MethodDeclaration */ &&
+                        m.kind !== 167 /* GetAccessor */ &&
+                        m.kind !== 168 /* SetAccessor */ &&
+                        m.kind !== 290 /* SpreadAssignment */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -117543,10 +120421,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 !== 162 /* PropertyDeclaration */ &&
-                        m.kind !== 164 /* MethodDeclaration */ &&
-                        m.kind !== 166 /* GetAccessor */ &&
-                        m.kind !== 167 /* SetAccessor */) {
+                    if (m.kind !== 163 /* PropertyDeclaration */ &&
+                        m.kind !== 165 /* MethodDeclaration */ &&
+                        m.kind !== 167 /* GetAccessor */ &&
+                        m.kind !== 168 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -117588,7 +120466,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 277 /* JsxAttribute */) {
+                    if (attr.kind === 280 /* JsxAttribute */) {
                         seenNames.add(attr.name.escapedText);
                     }
                     else if (ts.isJsxSpreadAttribute(attr)) {
@@ -117638,7 +120516,7 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 80 /* FirstKeyword */; i <= 155 /* LastKeyword */; i++) {
+            for (var i = 80 /* FirstKeyword */; i <= 156 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
@@ -117665,11 +120543,10 @@ var ts;
                     case 1 /* All */:
                         return isFunctionLikeBodyKeyword(kind)
                             || kind === 133 /* DeclareKeyword */
-                            || kind === 138 /* ModuleKeyword */
-                            || kind === 148 /* TypeKeyword */
-                            || kind === 139 /* NamespaceKeyword */
-                            || kind === 126 /* AsKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 149 /* UndefinedKeyword */;
+                            || kind === 139 /* ModuleKeyword */
+                            || kind === 149 /* TypeKeyword */
+                            || kind === 140 /* NamespaceKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 150 /* UndefinedKeyword */;
                     case 5 /* FunctionLikeBodyKeywords */:
                         return isFunctionLikeBodyKeyword(kind);
                     case 2 /* ClassElementKeywords */:
@@ -117691,44 +120568,44 @@ var ts;
             switch (kind) {
                 case 125 /* AbstractKeyword */:
                 case 128 /* AnyKeyword */:
-                case 154 /* BigIntKeyword */:
+                case 155 /* BigIntKeyword */:
                 case 131 /* BooleanKeyword */:
                 case 133 /* DeclareKeyword */:
                 case 91 /* EnumKeyword */:
-                case 153 /* GlobalKeyword */:
+                case 154 /* GlobalKeyword */:
                 case 116 /* ImplementsKeyword */:
                 case 135 /* InferKeyword */:
                 case 117 /* InterfaceKeyword */:
-                case 136 /* IsKeyword */:
-                case 137 /* KeyOfKeyword */:
-                case 138 /* ModuleKeyword */:
-                case 139 /* NamespaceKeyword */:
-                case 140 /* NeverKeyword */:
-                case 143 /* NumberKeyword */:
-                case 144 /* ObjectKeyword */:
+                case 137 /* IsKeyword */:
+                case 138 /* KeyOfKeyword */:
+                case 139 /* ModuleKeyword */:
+                case 140 /* NamespaceKeyword */:
+                case 141 /* NeverKeyword */:
+                case 144 /* NumberKeyword */:
+                case 145 /* ObjectKeyword */:
                 case 120 /* PrivateKeyword */:
                 case 121 /* ProtectedKeyword */:
                 case 122 /* PublicKeyword */:
-                case 141 /* ReadonlyKeyword */:
-                case 146 /* StringKeyword */:
-                case 147 /* SymbolKeyword */:
-                case 148 /* TypeKeyword */:
-                case 150 /* UniqueKeyword */:
-                case 151 /* UnknownKeyword */:
+                case 142 /* ReadonlyKeyword */:
+                case 147 /* StringKeyword */:
+                case 148 /* SymbolKeyword */:
+                case 149 /* TypeKeyword */:
+                case 151 /* UniqueKeyword */:
+                case 152 /* UnknownKeyword */:
                     return true;
                 default:
                     return false;
             }
         }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 141 /* ReadonlyKeyword */;
+            return kind === 142 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
                 case 125 /* AbstractKeyword */:
                 case 132 /* ConstructorKeyword */:
                 case 134 /* GetKeyword */:
-                case 145 /* SetKeyword */:
+                case 146 /* SetKeyword */:
                 case 129 /* AsyncKeyword */:
                 case 133 /* DeclareKeyword */:
                     return true;
@@ -117739,6 +120616,7 @@ var ts;
         function isFunctionLikeBodyKeyword(kind) {
             return kind === 129 /* AsyncKeyword */
                 || kind === 130 /* AwaitKeyword */
+                || kind === 126 /* AsKeyword */
                 || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
@@ -117789,7 +120667,7 @@ var ts;
         function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 329 /* SyntaxList */:
+                case 334 /* 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);
@@ -117892,6 +120770,19 @@ var ts;
             }
             return false;
         }
+        function isStaticProperty(symbol) {
+            return !!(symbol.valueDeclaration && ts.getEffectiveModifierFlags(symbol.valueDeclaration) & 32 /* Static */ && ts.isClassLike(symbol.valueDeclaration.parent));
+        }
+        function tryGetObjectLiteralContextualType(node, typeChecker) {
+            var type = typeChecker.getContextualType(node);
+            if (type) {
+                return type;
+            }
+            if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 62 /* EqualsToken */) {
+                return typeChecker.getTypeAtLocation(node.parent);
+            }
+            return undefined;
+        }
     })(Completions = ts.Completions || (ts.Completions = {}));
 })(ts || (ts = {}));
 var ts;
@@ -117975,8 +120866,8 @@ var ts;
                 case 132 /* ConstructorKeyword */:
                     return getFromAllDeclarations(ts.isConstructorDeclaration, [132 /* ConstructorKeyword */]);
                 case 134 /* GetKeyword */:
-                case 145 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [134 /* GetKeyword */, 145 /* SetKeyword */]);
+                case 146 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [134 /* GetKeyword */, 146 /* SetKeyword */]);
                 case 130 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
                 case 129 /* AsyncKeyword */:
@@ -118024,7 +120915,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 294 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 297 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -118056,16 +120947,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 241 /* SwitchStatement */:
-                        if (statement.kind === 237 /* ContinueStatement */) {
+                    case 244 /* SwitchStatement */:
+                        if (statement.kind === 240 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 234 /* ForStatement */:
-                    case 235 /* ForInStatement */:
-                    case 236 /* ForOfStatement */:
-                    case 233 /* WhileStatement */:
-                    case 232 /* DoStatement */:
+                    case 237 /* ForStatement */:
+                    case 238 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
+                    case 236 /* WhileStatement */:
+                    case 235 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -118081,11 +120972,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 254 /* ModuleBlock */:
-                case 294 /* SourceFile */:
-                case 227 /* Block */:
-                case 281 /* CaseClause */:
-                case 282 /* DefaultClause */:
+                case 257 /* ModuleBlock */:
+                case 297 /* SourceFile */:
+                case 230 /* Block */:
+                case 284 /* CaseClause */:
+                case 285 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return __spreadArrays(declaration.members, [declaration]);
@@ -118093,14 +120984,14 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 165 /* Constructor */:
-                case 164 /* MethodDeclaration */:
-                case 248 /* FunctionDeclaration */:
+                case 166 /* Constructor */:
+                case 165 /* MethodDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return __spreadArrays(container.parameters, (ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 250 /* InterfaceDeclaration */:
-                case 176 /* TypeLiteral */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 253 /* InterfaceDeclaration */:
+                case 177 /* TypeLiteral */:
                     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.
@@ -118114,6 +121005,9 @@ var ts;
                         return __spreadArrays(nodes, [container]);
                     }
                     return nodes;
+                // Syntactically invalid positions that the parser might produce anyway
+                case 200 /* ObjectLiteralExpression */:
+                    return undefined;
                 default:
                     ts.Debug.assertNever(container, "Invalid container kind.");
             }
@@ -118133,7 +121027,7 @@ var ts;
             var keywords = [];
             if (pushKeywordIf(keywords, loopNode.getFirstToken(), 96 /* ForKeyword */, 114 /* WhileKeyword */, 89 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 232 /* DoStatement */) {
+                if (loopNode.kind === 235 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
                         if (pushKeywordIf(keywords, loopTokens[i], 114 /* WhileKeyword */)) {
@@ -118153,13 +121047,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 234 /* ForStatement */:
-                    case 235 /* ForInStatement */:
-                    case 236 /* ForOfStatement */:
-                    case 232 /* DoStatement */:
-                    case 233 /* WhileStatement */:
+                    case 237 /* ForStatement */:
+                    case 238 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
+                    case 235 /* DoStatement */:
+                    case 236 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 241 /* SwitchStatement */:
+                    case 244 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -118526,41 +121420,39 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 200 /* CallExpression */:
+                            case 203 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 246 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 249 /* VariableDeclaration */) {
                                         var name = parent.name;
                                         if (name.kind === 78 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
                                     }
-                                    // Don't support re-exporting 'require()' calls, so just add a single indirect user.
-                                    addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
                             case 78 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 257 /* ImportEqualsDeclaration */:
+                            case 260 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasSyntacticModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 258 /* ImportDeclaration */:
+                            case 261 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 260 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 263 /* 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 264 /* ExportDeclaration */:
+                            case 267 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
                                 }
-                                else if (direct.exportClause.kind === 266 /* NamespaceExport */) {
+                                else if (direct.exportClause.kind === 269 /* NamespaceExport */) {
                                     // `export * as foo from "foo"` add to indirect uses
                                     addIndirectUsers(getSourceFileLikeForImportDeclaration(direct));
                                 }
@@ -118569,7 +121461,7 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 192 /* ImportType */:
+                            case 195 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
@@ -118586,7 +121478,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 294 /* SourceFile */ || sourceFileLike.kind === 253 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 297 /* SourceFile */ || sourceFileLike.kind === 256 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -118643,7 +121535,7 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 257 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 260 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
@@ -118653,7 +121545,7 @@ var ts;
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 192 /* ImportType */) {
+                if (decl.kind === 195 /* ImportType */) {
                     if (decl.qualifier) {
                         var firstIdentifier = ts.getFirstIdentifier(decl.qualifier);
                         if (firstIdentifier.escapedText === ts.symbolName(exportSymbol)) {
@@ -118669,7 +121561,7 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 264 /* ExportDeclaration */) {
+                if (decl.kind === 267 /* ExportDeclaration */) {
                     if (decl.exportClause && ts.isNamedExports(decl.exportClause)) {
                         searchForNamedImport(decl.exportClause);
                     }
@@ -118678,10 +121570,10 @@ var ts;
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 260 /* NamespaceImport */:
+                        case 263 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 261 /* NamedImports */:
+                        case 264 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -118731,7 +121623,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 267 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 270 /* 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);
@@ -118760,7 +121652,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 === 294 /* SourceFile */) {
+                if (searchSourceFile.kind === 297 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -118808,7 +121700,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 === 294 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 297 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -118823,15 +121715,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 264 /* ExportDeclaration */:
-                        case 258 /* ImportDeclaration */: {
+                        case 267 /* ExportDeclaration */:
+                        case 261 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 257 /* ImportEqualsDeclaration */: {
+                        case 260 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -118855,7 +121747,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 198 /* PropertyAccessExpression */) {
+                    if (parent.kind === 201 /* 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)
@@ -118988,15 +121880,17 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 262 /* ImportSpecifier */:
+                case 265 /* 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 259 /* ImportClause */:
-                case 260 /* NamespaceImport */:
+                case 262 /* ImportClause */:
+                case 263 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
+                case 198 /* BindingElement */:
+                    return ts.isInJSFile(node) && ts.isRequireVariableDeclaration(parent, /*requireStringLiteralLikeArgument*/ true);
                 default:
                     return false;
             }
@@ -119019,6 +121913,14 @@ var ts;
                     if (ts.isExportSpecifier(declaration) && !declaration.propertyName && !declaration.parent.parent.moduleSpecifier) {
                         return checker.getExportSpecifierLocalTargetSymbol(declaration);
                     }
+                    else if (ts.isPropertyAccessExpression(declaration) && ts.isModuleExportsAccessExpression(declaration.expression) && !ts.isPrivateIdentifier(declaration.name)) {
+                        return checker.getExportSpecifierLocalTargetSymbol(declaration.name);
+                    }
+                    else if (ts.isShorthandPropertyAssignment(declaration)
+                        && ts.isBinaryExpression(declaration.parent.parent)
+                        && ts.getAssignmentDeclarationKind(declaration.parent.parent) === 2 /* ModuleExports */) {
+                        return checker.getExportSpecifierLocalTargetSymbol(declaration.name);
+                    }
                 }
             }
             return symbol;
@@ -119027,21 +121929,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 200 /* CallExpression */) {
+            if (node.kind === 203 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 294 /* SourceFile */) {
+            if (parent.kind === 297 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 254 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 257 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 253 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 256 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 269 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 272 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -119143,7 +122045,7 @@ var ts;
             if (!node)
                 return undefined;
             switch (node.kind) {
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
                         node :
                         ts.isVariableStatement(node.parent.parent) ?
@@ -119151,28 +122053,28 @@ var ts;
                             ts.isForInOrOfStatement(node.parent.parent) ?
                                 getContextNode(node.parent.parent) :
                                 node.parent;
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return getContextNode(node.parent.parent);
-                case 262 /* ImportSpecifier */:
+                case 265 /* ImportSpecifier */:
                     return node.parent.parent.parent;
-                case 267 /* ExportSpecifier */:
-                case 260 /* NamespaceImport */:
+                case 270 /* ExportSpecifier */:
+                case 263 /* NamespaceImport */:
                     return node.parent.parent;
-                case 259 /* ImportClause */:
-                case 266 /* NamespaceExport */:
+                case 262 /* ImportClause */:
+                case 269 /* NamespaceExport */:
                     return node.parent;
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return ts.isExpressionStatement(node.parent) ?
                         node.parent :
                         node;
-                case 236 /* ForOfStatement */:
-                case 235 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
+                case 238 /* ForInStatement */:
                     return {
                         start: node.initializer,
                         end: node.expression
                     };
-                case 285 /* PropertyAssignment */:
-                case 286 /* ShorthandPropertyAssignment */:
+                case 288 /* PropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
                         getContextNode(ts.findAncestor(node.parent, function (node) {
                             return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
@@ -119229,9 +122131,9 @@ var ts;
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referenceEntries;
             var entries = getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position);
-            if (node.parent.kind === 198 /* PropertyAccessExpression */
-                || node.parent.kind === 195 /* BindingElement */
-                || node.parent.kind === 199 /* ElementAccessExpression */
+            if (node.parent.kind === 201 /* PropertyAccessExpression */
+                || node.parent.kind === 198 /* BindingElement */
+                || node.parent.kind === 202 /* ElementAccessExpression */
                 || node.kind === 105 /* SuperKeyword */) {
                 referenceEntries = entries && __spreadArrays(entries);
             }
@@ -119255,13 +122157,13 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 294 /* SourceFile */) {
+            if (node.kind === 297 /* 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 === 286 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 289 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
@@ -119427,13 +122329,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 197 /* ObjectLiteralExpression */) {
+            else if (node.kind === 200 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 218 /* ClassExpression */) {
+            else if (node.kind === 221 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -119494,47 +122396,47 @@ var ts;
             if (!!(decl.flags & 8388608 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 213 /* BinaryExpression */:
-                case 195 /* BindingElement */:
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 216 /* BinaryExpression */:
+                case 198 /* BindingElement */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                 case 87 /* DefaultKeyword */:
-                case 252 /* EnumDeclaration */:
-                case 288 /* EnumMember */:
-                case 267 /* ExportSpecifier */:
-                case 259 /* ImportClause */: // default import
-                case 257 /* ImportEqualsDeclaration */:
-                case 262 /* ImportSpecifier */:
-                case 250 /* InterfaceDeclaration */:
-                case 320 /* JSDocCallbackTag */:
-                case 327 /* JSDocTypedefTag */:
-                case 277 /* JsxAttribute */:
-                case 253 /* ModuleDeclaration */:
-                case 256 /* NamespaceExportDeclaration */:
-                case 260 /* NamespaceImport */:
-                case 266 /* NamespaceExport */:
-                case 159 /* Parameter */:
-                case 286 /* ShorthandPropertyAssignment */:
-                case 251 /* TypeAliasDeclaration */:
-                case 158 /* TypeParameter */:
+                case 255 /* EnumDeclaration */:
+                case 291 /* EnumMember */:
+                case 270 /* ExportSpecifier */:
+                case 262 /* ImportClause */: // default import
+                case 260 /* ImportEqualsDeclaration */:
+                case 265 /* ImportSpecifier */:
+                case 253 /* InterfaceDeclaration */:
+                case 324 /* JSDocCallbackTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 280 /* JsxAttribute */:
+                case 256 /* ModuleDeclaration */:
+                case 259 /* NamespaceExportDeclaration */:
+                case 263 /* NamespaceImport */:
+                case 269 /* NamespaceExport */:
+                case 160 /* Parameter */:
+                case 289 /* ShorthandPropertyAssignment */:
+                case 254 /* TypeAliasDeclaration */:
+                case 159 /* TypeParameter */:
                     return true;
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 165 /* Constructor */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 166 /* Constructor */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return !!decl.body;
-                case 246 /* VariableDeclaration */:
-                case 162 /* PropertyDeclaration */:
+                case 249 /* VariableDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 163 /* MethodSignature */:
-                case 161 /* PropertySignature */:
-                case 328 /* JSDocPropertyTag */:
-                case 322 /* JSDocParameterTag */:
+                case 164 /* MethodSignature */:
+                case 162 /* PropertySignature */:
+                case 333 /* JSDocPropertyTag */:
+                case 326 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -119695,10 +122597,10 @@ var ts;
                     for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         switch (decl.kind) {
-                            case 294 /* SourceFile */:
+                            case 297 /* 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 253 /* ModuleDeclaration */:
+                            case 256 /* ModuleDeclaration */:
                                 if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                     references.push(nodeEntry(decl.name));
                                 }
@@ -119727,9 +122629,9 @@ var ts;
             }
             /** As in a `readonly prop: any` or `constructor(readonly prop: any)`, not a `readonly any[]`. */
             function isReadonlyTypeOperator(node) {
-                return node.kind === 141 /* ReadonlyKeyword */
+                return node.kind === 142 /* ReadonlyKeyword */
                     && ts.isTypeOperatorNode(node.parent)
-                    && node.parent.operator === 141 /* ReadonlyKeyword */;
+                    && node.parent.operator === 142 /* ReadonlyKeyword */;
             }
             /** getReferencedSymbols for special node kinds. */
             function getReferencedSymbolsSpecial(node, sourceFiles, cancellationToken) {
@@ -119740,12 +122642,12 @@ var ts;
                     }
                     // A modifier readonly (like on a property declaration) is not special;
                     // a readonly type keyword (like `readonly string[]`) is.
-                    if (node.kind === 141 /* ReadonlyKeyword */ && !isReadonlyTypeOperator(node)) {
+                    if (node.kind === 142 /* ReadonlyKeyword */ && !isReadonlyTypeOperator(node)) {
                         return undefined;
                     }
                     // Likewise, when we *are* looking for a special keyword, make sure we
                     // *don’t* include readonly member modifiers.
-                    return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken, node.kind === 141 /* ReadonlyKeyword */ ? isReadonlyTypeOperator : undefined);
+                    return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken, node.kind === 142 /* ReadonlyKeyword */ ? isReadonlyTypeOperator : undefined);
                 }
                 // Labels
                 if (ts.isJumpStatementTarget(node)) {
@@ -120046,7 +122948,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 === 205 /* FunctionExpression */ || valueDeclaration.kind === 218 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 208 /* FunctionExpression */ || valueDeclaration.kind === 221 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -120056,7 +122958,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasEffectiveModifier(d, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(d); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 249 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 252 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -120085,7 +122987,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 294 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 297 /* 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;
@@ -120457,14 +123359,14 @@ var ts;
                     for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         var ctrKeyword = ts.findChildOfKind(decl, 132 /* ConstructorKeyword */, sourceFile);
-                        ts.Debug.assert(decl.kind === 165 /* Constructor */ && !!ctrKeyword);
+                        ts.Debug.assert(decl.kind === 166 /* Constructor */ && !!ctrKeyword);
                         addNode(ctrKeyword);
                     }
                 }
                 if (classSymbol.exports) {
                     classSymbol.exports.forEach(function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 164 /* MethodDeclaration */) {
+                        if (decl && decl.kind === 165 /* MethodDeclaration */) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 107 /* ThisKeyword */, function (thisKeyword) {
@@ -120488,7 +123390,7 @@ var ts;
                 }
                 for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 165 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 166 /* Constructor */);
                     var body = decl.body;
                     if (body) {
                         forEachDescendantOfKind(body, 105 /* SuperKeyword */, function (node) {
@@ -120518,7 +123420,7 @@ var ts;
                 if (refNode.kind !== 78 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 286 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 289 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -120538,7 +123440,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 227 /* Block */) {
+                        if (body.kind === 230 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -120566,13 +123468,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 204 /* ParenthesizedExpression */:
+                    case 207 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 206 /* ArrowFunction */:
-                    case 205 /* FunctionExpression */:
-                    case 197 /* ObjectLiteralExpression */:
-                    case 218 /* ClassExpression */:
-                    case 196 /* ArrayLiteralExpression */:
+                    case 209 /* ArrowFunction */:
+                    case 208 /* FunctionExpression */:
+                    case 200 /* ObjectLiteralExpression */:
+                    case 221 /* ClassExpression */:
+                    case 199 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -120625,13 +123527,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 162 /* PropertyDeclaration */:
-                    case 161 /* PropertySignature */:
-                    case 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
-                    case 165 /* Constructor */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 163 /* PropertyDeclaration */:
+                    case 162 /* PropertySignature */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
+                    case 166 /* Constructor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -120652,41 +123554,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 78 /* Identifier */ && node.parent.kind === 159 /* Parameter */ && node.parent.name === node;
+                return node.kind === 78 /* Identifier */ && node.parent.kind === 160 /* 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 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 162 /* PropertyDeclaration */:
-                    case 161 /* PropertySignature */:
-                    case 165 /* Constructor */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 163 /* PropertyDeclaration */:
+                    case 162 /* PropertySignature */:
+                    case 166 /* Constructor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                         staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 294 /* SourceFile */:
+                    case 297 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* 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 === 294 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 297 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -120694,19 +123596,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 205 /* FunctionExpression */:
-                            case 248 /* FunctionDeclaration */:
+                            case 208 /* FunctionExpression */:
+                            case 251 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 164 /* MethodDeclaration */:
-                            case 163 /* MethodSignature */:
+                            case 165 /* MethodDeclaration */:
+                            case 164 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 218 /* ClassExpression */:
-                            case 249 /* ClassDeclaration */:
+                            case 221 /* ClassExpression */:
+                            case 252 /* 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.getSyntacticModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 294 /* SourceFile */:
-                                return container.kind === 294 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 297 /* SourceFile */:
+                                return container.kind === 297 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return nodeEntry(n); });
@@ -120805,7 +123707,7 @@ var ts;
                     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]);
                 }
-                var exportSpecifier = ts.getDeclarationOfKind(symbol, 267 /* ExportSpecifier */);
+                var exportSpecifier = ts.getDeclarationOfKind(symbol, 270 /* ExportSpecifier */);
                 if (!isForRenamePopulateSearchSymbolSet || exportSpecifier && !exportSpecifier.propertyName) {
                     var localSymbol = exportSpecifier && checker.getExportSpecifierLocalTargetSymbol(exportSpecifier);
                     if (localSymbol) {
@@ -120850,7 +123752,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 195 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 198 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -121077,16 +123979,16 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 164 /* MethodDeclaration */:
-                    if (node.parent.kind === 197 /* ObjectLiteralExpression */) {
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 165 /* MethodDeclaration */:
+                    if (node.parent.kind === 200 /* ObjectLiteralExpression */) {
                         return (_a = ts.getAssignedName(node.parent)) === null || _a === void 0 ? void 0 : _a.getText();
                     }
                     return (_b = ts.getNameOfDeclaration(node.parent)) === null || _b === void 0 ? void 0 : _b.getText();
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 253 /* ModuleDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     if (ts.isModuleBlock(node.parent) && ts.isIdentifier(node.parent.parent.name)) {
                         return node.parent.parent.name.getText();
                     }
@@ -121292,55 +124194,55 @@ var ts;
                 }
                 switch (node.kind) {
                     case 78 /* Identifier */:
-                    case 257 /* ImportEqualsDeclaration */:
-                    case 258 /* ImportDeclaration */:
-                    case 264 /* ExportDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
+                    case 261 /* ImportDeclaration */:
+                    case 267 /* ExportDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
                         // do not descend into nodes that cannot contain callable nodes
                         return;
-                    case 203 /* TypeAssertionExpression */:
-                    case 221 /* AsExpression */:
+                    case 206 /* TypeAssertionExpression */:
+                    case 224 /* AsExpression */:
                         // do not descend into the type side of an assertion
                         collect(node.expression);
                         return;
-                    case 246 /* VariableDeclaration */:
-                    case 159 /* Parameter */:
+                    case 249 /* VariableDeclaration */:
+                    case 160 /* Parameter */:
                         // do not descend into the type of a variable or parameter declaration
                         collect(node.name);
                         collect(node.initializer);
                         return;
-                    case 200 /* CallExpression */:
+                    case 203 /* CallExpression */:
                         // do not descend into the type arguments of a call expression
                         recordCallSite(node);
                         collect(node.expression);
                         ts.forEach(node.arguments, collect);
                         return;
-                    case 201 /* NewExpression */:
+                    case 204 /* NewExpression */:
                         // do not descend into the type arguments of a new expression
                         recordCallSite(node);
                         collect(node.expression);
                         ts.forEach(node.arguments, collect);
                         return;
-                    case 202 /* TaggedTemplateExpression */:
+                    case 205 /* TaggedTemplateExpression */:
                         // do not descend into the type arguments of a tagged template expression
                         recordCallSite(node);
                         collect(node.tag);
                         collect(node.template);
                         return;
-                    case 272 /* JsxOpeningElement */:
-                    case 271 /* JsxSelfClosingElement */:
+                    case 275 /* JsxOpeningElement */:
+                    case 274 /* JsxSelfClosingElement */:
                         // do not descend into the type arguments of a JsxOpeningLikeElement
                         recordCallSite(node);
                         collect(node.tagName);
                         collect(node.attributes);
                         return;
-                    case 160 /* Decorator */:
+                    case 161 /* Decorator */:
                         recordCallSite(node);
                         collect(node.expression);
                         return;
-                    case 198 /* PropertyAccessExpression */:
-                    case 199 /* ElementAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         recordCallSite(node);
                         ts.forEachChild(node, collect);
                         break;
@@ -121390,22 +124292,22 @@ var ts;
             var callSites = [];
             var collect = createCallSiteCollector(program, callSites);
             switch (node.kind) {
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     collectCallSitesOfSourceFile(node, collect);
                     break;
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     collectCallSitesOfModuleDeclaration(node, collect);
                     break;
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     collectCallSitesOfFunctionLikeDeclaration(program.getTypeChecker(), node, collect);
                     break;
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     collectCallSitesOfClassLikeDeclaration(node, collect);
                     break;
                 default:
@@ -121686,9 +124588,7 @@ var ts;
                 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); })) {
+                if (typeChecker.getRootSymbols(symbol).some(function (s) { return symbolMatchesSignature(s, calledDeclaration); })) {
                     return [sigInfo];
                 }
                 else {
@@ -121702,7 +124602,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 === 286 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 289 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -121747,6 +124647,11 @@ var ts;
             return getDefinitionFromSymbol(typeChecker, symbol, node);
         }
         GoToDefinition.getDefinitionAtPosition = getDefinitionAtPosition;
+        function isShorthandPropertyAssignmentOfModuleExports(symbol) {
+            var shorthandProperty = ts.tryCast(symbol.valueDeclaration, ts.isShorthandPropertyAssignment);
+            var binaryExpression = ts.tryCast(shorthandProperty === null || shorthandProperty === void 0 ? void 0 : shorthandProperty.parent.parent, ts.isAssignmentExpression);
+            return !!binaryExpression && ts.getAssignmentDeclarationKind(binaryExpression) === 2 /* ModuleExports */;
+        }
         /**
          * 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;`.
@@ -121844,19 +124749,24 @@ var ts;
             // 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;
+            while (symbol) {
+                if (symbol.flags & 2097152 /* Alias */ && shouldSkipAlias(node, symbol.declarations[0])) {
+                    var aliased = checker.getAliasedSymbol(symbol);
+                    if (!aliased.declarations) {
+                        break;
+                    }
+                    symbol = aliased;
                 }
-            }
-            if (symbol && ts.isInJSFile(node)) {
-                var requireCall = ts.forEach(symbol.declarations, function (d) { return ts.isVariableDeclaration(d) && !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true) ? d.initializer : undefined; });
-                if (requireCall) {
-                    var moduleSymbol = checker.getSymbolAtLocation(requireCall.arguments[0]);
-                    if (moduleSymbol) {
-                        return checker.resolveExternalModuleSymbol(moduleSymbol);
+                else if (isShorthandPropertyAssignmentOfModuleExports(symbol)) {
+                    // Skip past `module.exports = { Foo }` even though 'Foo' is not a real alias
+                    var shorthandTarget = checker.resolveName(symbol.name, symbol.valueDeclaration, 111551 /* Value */, /*excludeGlobals*/ false);
+                    if (!ts.some(shorthandTarget === null || shorthandTarget === void 0 ? void 0 : shorthandTarget.declarations)) {
+                        break;
                     }
+                    symbol = shorthandTarget;
+                }
+                else {
+                    break;
                 }
             }
             return symbol;
@@ -121874,11 +124784,14 @@ var ts;
                 return true;
             }
             switch (declaration.kind) {
-                case 259 /* ImportClause */:
-                case 257 /* ImportEqualsDeclaration */:
+                case 262 /* ImportClause */:
+                case 260 /* ImportEqualsDeclaration */:
                     return true;
-                case 262 /* ImportSpecifier */:
-                    return declaration.parent.kind === 261 /* NamedImports */;
+                case 265 /* ImportSpecifier */:
+                    return declaration.parent.kind === 264 /* NamedImports */;
+                case 198 /* BindingElement */:
+                case 249 /* VariableDeclaration */:
+                    return ts.isInJSFile(declaration) && ts.isRequireVariableDeclaration(declaration, /*requireStringLiteralLikeArgument*/ true);
                 default:
                     return false;
             }
@@ -121963,9 +124876,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 165 /* Constructor */:
-                case 174 /* ConstructorType */:
-                case 169 /* ConstructSignature */:
+                case 166 /* Constructor */:
+                case 175 /* ConstructorType */:
+                case 170 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -122080,11 +124993,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 322 /* JSDocParameterTag */:
-                case 328 /* JSDocPropertyTag */:
+                case 326 /* JSDocParameterTag */:
+                case 333 /* JSDocPropertyTag */:
                     return [declaration];
-                case 320 /* JSDocCallbackTag */:
-                case 327 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 331 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -122105,18 +125018,19 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 312 /* JSDocImplementsTag */:
+                case 316 /* JSDocImplementsTag */:
                     return withNode(tag.class);
-                case 311 /* JSDocAugmentsTag */:
+                case 315 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 326 /* JSDocTemplateTag */:
+                case 330 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 325 /* JSDocTypeTag */:
+                case 329 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 327 /* JSDocTypedefTag */:
-                case 320 /* JSDocCallbackTag */:
-                case 328 /* JSDocPropertyTag */:
-                case 322 /* JSDocParameterTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 333 /* JSDocPropertyTag */:
+                case 326 /* JSDocParameterTag */:
+                case 332 /* JSDocSeeTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -122138,7 +125052,7 @@ var ts;
                     name: tagName,
                     kind: "keyword" /* keyword */,
                     kindModifiers: "",
-                    sortText: "0",
+                    sortText: ts.Completions.SortText.LocationPriority,
                 };
             }));
         }
@@ -122150,7 +125064,7 @@ var ts;
                     name: "@" + tagName,
                     kind: "keyword" /* keyword */,
                     kindModifiers: "",
-                    sortText: "0"
+                    sortText: ts.Completions.SortText.LocationPriority
                 };
             }));
         }
@@ -122184,7 +125098,7 @@ var ts;
                     || nameThusFar !== undefined && !ts.startsWith(name, nameThusFar)) {
                     return undefined;
                 }
-                return { name: name, kind: "parameter" /* parameterElement */, kindModifiers: "", sortText: "0" };
+                return { name: name, kind: "parameter" /* parameterElement */, kindModifiers: "", sortText: ts.Completions.SortText.LocationPriority };
             });
         }
         JsDoc.getJSDocParameterNameCompletions = getJSDocParameterNameCompletions;
@@ -122285,23 +125199,24 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 164 /* MethodDeclaration */:
-                case 165 /* Constructor */:
-                case 163 /* MethodSignature */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 165 /* MethodDeclaration */:
+                case 166 /* Constructor */:
+                case 164 /* MethodSignature */:
+                case 209 /* ArrowFunction */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 285 /* PropertyAssignment */:
+                case 288 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 161 /* PropertySignature */:
-                case 252 /* EnumDeclaration */:
-                case 288 /* EnumMember */:
-                case 251 /* TypeAliasDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 162 /* PropertySignature */:
+                case 255 /* EnumDeclaration */:
+                case 291 /* EnumMember */:
+                case 254 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 229 /* VariableStatement */: {
+                case 232 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -122309,16 +125224,16 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     return "quit";
-                case 253 /* ModuleDeclaration */:
+                case 256 /* 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 === 253 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 230 /* ExpressionStatement */:
+                    return commentOwner.parent.kind === 256 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 233 /* ExpressionStatement */:
                     return getCommentOwnerInfoWorker(commentOwner.expression);
-                case 213 /* BinaryExpression */: {
+                case 216 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -122326,7 +125241,7 @@ var ts;
                     var parameters_2 = ts.isFunctionLike(be.right) ? be.right.parameters : ts.emptyArray;
                     return { commentOwner: commentOwner, parameters: parameters_2 };
                 }
-                case 162 /* PropertyDeclaration */:
+                case 163 /* PropertyDeclaration */:
                     var init = commentOwner.initializer;
                     if (init && (ts.isFunctionExpression(init) || ts.isArrowFunction(init))) {
                         return { commentOwner: commentOwner, parameters: init.parameters };
@@ -122342,14 +125257,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 204 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 207 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 218 /* ClassExpression */: {
+                case 221 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -122411,9 +125326,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 259 /* ImportClause */:
-                case 262 /* ImportSpecifier */:
-                case 257 /* ImportEqualsDeclaration */:
+                case 262 /* ImportClause */:
+                case 265 /* ImportSpecifier */:
+                case 260 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -122423,7 +125338,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 157 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 158 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -122440,7 +125355,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 === 157 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 158 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -122648,7 +125563,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 165 /* Constructor */:
+                case 166 /* 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);
@@ -122660,21 +125575,21 @@ var ts;
                         }
                     }
                     break;
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
-                case 163 /* MethodSignature */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
+                case 164 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 259 /* ImportClause */:
+                case 262 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -122686,7 +125601,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 260 /* NamespaceImport */) {
+                        if (namedBindings.kind === 263 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -122697,17 +125612,17 @@ var ts;
                         }
                     }
                     break;
-                case 286 /* ShorthandPropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     addNodeWithRecursiveChild(node, node.name);
                     break;
-                case 287 /* SpreadAssignment */:
+                case 290 /* SpreadAssignment */:
                     var expression = node.expression;
                     // Use the expression as the name of the SpreadAssignment, otherwise show as <unknown>.
                     ts.isIdentifier(expression) ? addLeafNode(node, expression) : addLeafNode(node);
                     break;
-                case 195 /* BindingElement */:
-                case 285 /* PropertyAssignment */:
-                case 246 /* VariableDeclaration */:
+                case 198 /* BindingElement */:
+                case 288 /* PropertyAssignment */:
+                case 249 /* VariableDeclaration */:
                     var _e = node, name = _e.name, initializer = _e.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -122722,7 +125637,7 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     var nameNode = node.name;
                     // If we see a function declaration track as a possible ES5 class
                     if (nameNode && ts.isIdentifier(nameNode)) {
@@ -122730,11 +125645,11 @@ var ts;
                     }
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 206 /* ArrowFunction */:
-                case 205 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     startNode(node);
                     for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
                         var member = _g[_f];
@@ -122744,9 +125659,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 250 /* InterfaceDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 253 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _h = 0, _j = node.members; _h < _j.length; _h++) {
                         var member = _j[_h];
@@ -122754,12 +125669,12 @@ var ts;
                     }
                     endNode();
                     break;
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 263 /* ExportAssignment */: {
+                case 266 /* ExportAssignment */: {
                     var expression_1 = node.expression;
-                    var child = ts.isObjectLiteralExpression(expression_1) ? expression_1 :
+                    var child = ts.isObjectLiteralExpression(expression_1) || ts.isCallExpression(expression_1) ? expression_1 :
                         ts.isArrowFunction(expression_1) || ts.isFunctionExpression(expression_1) ? expression_1.body : undefined;
                     if (child) {
                         startNode(node);
@@ -122771,16 +125686,16 @@ var ts;
                     }
                     break;
                 }
-                case 267 /* ExportSpecifier */:
-                case 257 /* ImportEqualsDeclaration */:
-                case 170 /* IndexSignature */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 251 /* TypeAliasDeclaration */:
+                case 270 /* ExportSpecifier */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 171 /* IndexSignature */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 254 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 200 /* CallExpression */:
-                case 213 /* BinaryExpression */: {
+                case 203 /* CallExpression */:
+                case 216 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -123022,12 +125937,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 162 /* PropertyDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 163 /* PropertyDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                     return ts.hasSyntacticModifier(a, 32 /* Static */) === ts.hasSyntacticModifier(b, 32 /* Static */);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -123043,7 +125958,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 !== 253 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 256 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -123073,7 +125988,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 253 /* ModuleDeclaration */) {
+            if (node.kind === 256 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -123082,16 +125997,16 @@ var ts;
                 return propertyName && ts.unescapeLeadingUnderscores(propertyName);
             }
             switch (node.kind) {
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 218 /* ClassExpression */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 221 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 253 /* ModuleDeclaration */) {
+            if (node.kind === 256 /* ModuleDeclaration */) {
                 return cleanText(getModuleName(node));
             }
             if (name) {
@@ -123103,18 +126018,18 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 294 /* SourceFile */:
+                case 297 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 263 /* ExportAssignment */:
+                case 266 /* ExportAssignment */:
                     return ts.isExportAssignment(node) && node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
-                case 206 /* ArrowFunction */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
+                case 209 /* ArrowFunction */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
                     if (ts.getSyntacticModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -123122,13 +126037,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     return "constructor";
-                case 169 /* ConstructSignature */:
+                case 170 /* ConstructSignature */:
                     return "new()";
-                case 168 /* CallSignature */:
+                case 169 /* CallSignature */:
                     return "()";
-                case 170 /* IndexSignature */:
+                case 171 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -123161,19 +126076,19 @@ var ts;
                 }
                 // Some nodes are otherwise important enough to always include in the primary navigation menu.
                 switch (navigationBarNodeKind(item)) {
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 252 /* EnumDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 253 /* ModuleDeclaration */:
-                    case 294 /* SourceFile */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 327 /* JSDocTypedefTag */:
-                    case 320 /* JSDocCallbackTag */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 255 /* EnumDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 256 /* ModuleDeclaration */:
+                    case 297 /* SourceFile */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 331 /* JSDocTypedefTag */:
+                    case 324 /* JSDocCallbackTag */:
                         return true;
-                    case 206 /* ArrowFunction */:
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -123183,10 +126098,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 254 /* ModuleBlock */:
-                        case 294 /* SourceFile */:
-                        case 164 /* MethodDeclaration */:
-                        case 165 /* Constructor */:
+                        case 257 /* ModuleBlock */:
+                        case 297 /* SourceFile */:
+                        case 165 /* MethodDeclaration */:
+                        case 166 /* Constructor */:
                             return true;
                         default:
                             return false;
@@ -123244,9 +126159,8 @@ var ts;
                 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 === 253 /* ModuleDeclaration */) {
+            var result = [ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name)];
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 256 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -123260,13 +126174,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 157 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 158 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 294 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 297 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 246 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 249 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -123324,9 +126238,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 206 /* ArrowFunction */:
-                case 205 /* FunctionExpression */:
-                case 218 /* ClassExpression */:
+                case 209 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
+                case 221 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -123680,11 +126594,11 @@ var ts;
         function getModuleSpecifierExpression(declaration) {
             var _a;
             switch (declaration.kind) {
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return (_a = ts.tryCast(declaration.moduleReference, ts.isExternalModuleReference)) === null || _a === void 0 ? void 0 : _a.expression;
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return declaration.moduleSpecifier;
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return declaration.declarationList.declarations[0].initializer.arguments[0];
             }
         }
@@ -123723,19 +126637,19 @@ var ts;
         function getImportKindOrder(s1) {
             var _a;
             switch (s1.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     if (!s1.importClause)
                         return 0;
                     if (s1.importClause.isTypeOnly)
                         return 1;
-                    if (((_a = s1.importClause.namedBindings) === null || _a === void 0 ? void 0 : _a.kind) === 260 /* NamespaceImport */)
+                    if (((_a = s1.importClause.namedBindings) === null || _a === void 0 ? void 0 : _a.kind) === 263 /* NamespaceImport */)
                         return 2;
                     if (s1.importClause.name)
                         return 3;
                     return 4;
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return 5;
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return 6;
             }
         }
@@ -123781,12 +126695,9 @@ var ts;
                 if (depthRemaining === 0)
                     return;
                 cancellationToken.throwIfCancellationRequested();
-                if (ts.isDeclaration(n) || n.kind === 1 /* EndOfFileToken */) {
+                if (ts.isDeclaration(n) || ts.isVariableStatement(n) || n.kind === 1 /* EndOfFileToken */) {
                     addOutliningForLeadingCommentsForNode(n, sourceFile, cancellationToken, out);
                 }
-                if (isFunctionExpressionAssignedToVariable(n)) {
-                    addOutliningForLeadingCommentsForNode(n.parent.parent.parent, sourceFile, cancellationToken, out);
-                }
                 if (ts.isFunctionLike(n) && ts.isBinaryExpression(n.parent) && ts.isPropertyAccessExpression(n.parent.left)) {
                     addOutliningForLeadingCommentsForNode(n.parent.left, sourceFile, cancellationToken, out);
                 }
@@ -123814,13 +126725,6 @@ var ts;
                 }
                 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 = [];
@@ -123901,7 +126805,7 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 227 /* Block */:
+                case 230 /* Block */:
                     if (ts.isFunctionLike(n.parent)) {
                         return functionSpan(n.parent, n, sourceFile);
                     }
@@ -123909,16 +126813,16 @@ var ts;
                     // 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 232 /* DoStatement */:
-                        case 235 /* ForInStatement */:
-                        case 236 /* ForOfStatement */:
-                        case 234 /* ForStatement */:
-                        case 231 /* IfStatement */:
-                        case 233 /* WhileStatement */:
-                        case 240 /* WithStatement */:
-                        case 284 /* CatchClause */:
+                        case 235 /* DoStatement */:
+                        case 238 /* ForInStatement */:
+                        case 239 /* ForOfStatement */:
+                        case 237 /* ForStatement */:
+                        case 234 /* IfStatement */:
+                        case 236 /* WhileStatement */:
+                        case 243 /* WithStatement */:
+                        case 287 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 244 /* TryStatement */:
+                        case 247 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
@@ -123935,40 +126839,40 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 254 /* ModuleBlock */:
+                case 257 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 250 /* InterfaceDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 255 /* CaseBlock */:
-                case 176 /* TypeLiteral */:
-                case 193 /* ObjectBindingPattern */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 253 /* InterfaceDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 258 /* CaseBlock */:
+                case 177 /* TypeLiteral */:
+                case 196 /* ObjectBindingPattern */:
                     return spanForNode(n);
-                case 178 /* TupleType */:
+                case 179 /* TupleType */:
                     return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isTupleTypeNode(n.parent), 22 /* OpenBracketToken */);
-                case 281 /* CaseClause */:
-                case 282 /* DefaultClause */:
+                case 284 /* CaseClause */:
+                case 285 /* DefaultClause */:
                     return spanForNodeArray(n.statements);
-                case 197 /* ObjectLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 196 /* ArrayLiteralExpression */:
+                case 199 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 270 /* JsxElement */:
+                case 273 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 274 /* JsxFragment */:
+                case 277 /* JsxFragment */:
                     return spanForJSXFragment(n);
-                case 271 /* JsxSelfClosingElement */:
-                case 272 /* JsxOpeningElement */:
+                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
-                case 215 /* TemplateExpression */:
+                case 218 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return spanForTemplateLiteral(n);
-                case 194 /* ArrayBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
                     return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isBindingElement(n.parent), 22 /* OpenBracketToken */);
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     return spanForArrowFunction(n);
-                case 200 /* CallExpression */:
+                case 203 /* CallExpression */:
                     return spanForCallExpression(n);
             }
             function spanForCallExpression(node) {
@@ -124035,7 +126939,7 @@ var ts;
         function functionSpan(node, body, sourceFile) {
             var openToken = tryGetFunctionOpenToken(node, body, sourceFile);
             var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
-            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 206 /* ArrowFunction */);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 209 /* ArrowFunction */);
         }
         function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -124582,7 +127486,7 @@ var ts;
             if (token === 133 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 138 /* ModuleKeyword */) {
+                if (token === 139 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -124616,10 +127520,10 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 148 /* TypeKeyword */) {
+                    if (token === 149 /* TypeKeyword */) {
                         var skipTypeKeyword = ts.scanner.lookAhead(function () {
                             var token = ts.scanner.scan();
-                            return token !== 152 /* FromKeyword */ && (token === 41 /* AsteriskToken */ ||
+                            return token !== 153 /* FromKeyword */ && (token === 41 /* AsteriskToken */ ||
                                 token === 18 /* OpenBraceToken */ ||
                                 token === 78 /* Identifier */ ||
                                 ts.isKeyword(token));
@@ -124630,7 +127534,7 @@ var ts;
                     }
                     if (token === 78 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 152 /* FromKeyword */) {
+                        if (token === 153 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -124661,7 +127565,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 152 /* FromKeyword */) {
+                            if (token === 153 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -124677,7 +127581,7 @@ var ts;
                             token = nextToken();
                             if (token === 78 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 152 /* FromKeyword */) {
+                                if (token === 153 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -124698,7 +127602,7 @@ var ts;
             if (token === 92 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
-                if (token === 148 /* TypeKeyword */) {
+                if (token === 149 /* TypeKeyword */) {
                     var skipTypeKeyword = ts.scanner.lookAhead(function () {
                         var token = ts.scanner.scan();
                         return token === 41 /* AsteriskToken */ ||
@@ -124717,7 +127621,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 152 /* FromKeyword */) {
+                        if (token === 153 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -124729,7 +127633,7 @@ var ts;
                 }
                 else if (token === 41 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 152 /* FromKeyword */) {
+                    if (token === 153 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -124739,7 +127643,7 @@ var ts;
                 }
                 else if (token === 99 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 148 /* TypeKeyword */) {
+                    if (token === 149 /* TypeKeyword */) {
                         var skipTypeKeyword = ts.scanner.lookAhead(function () {
                             var token = ts.scanner.scan();
                             return token === 78 /* Identifier */ ||
@@ -124765,7 +127669,7 @@ var ts;
         function tryConsumeRequireCall(skipCurrentToken, allowTemplateLiterals) {
             if (allowTemplateLiterals === void 0) { allowTemplateLiterals = false; }
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 142 /* RequireKeyword */) {
+            if (token === 143 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -124908,8 +127812,13 @@ var ts;
         Rename.getRenameInfo = getRenameInfo;
         function getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile, options) {
             var symbol = typeChecker.getSymbolAtLocation(node);
-            if (!symbol)
-                return;
+            if (!symbol) {
+                if (ts.isLabelName(node)) {
+                    var name = ts.getTextOfNode(node);
+                    return getRenameInfoSuccess(name, name, "label" /* label */, "" /* none */, node, sourceFile);
+                }
+                return undefined;
+            }
             // Only allow a symbol to be renamed if it actually has at least one declaration.
             var declarations = symbol.declarations;
             if (!declarations || declarations.length === 0)
@@ -124926,7 +127835,7 @@ var ts;
                 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 === 157 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 158 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -125002,6 +127911,7 @@ var ts;
     var SmartSelectionRange;
     (function (SmartSelectionRange) {
         function getSmartSelectionRange(pos, sourceFile) {
+            var _a;
             var selectionRange = {
                 textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
             };
@@ -125014,7 +127924,7 @@ var ts;
                     var prevNode = children[i - 1];
                     var node = children[i];
                     var nextNode = children[i + 1];
-                    if (node.getStart(sourceFile) > pos) {
+                    if (ts.getTokenPosOfNode(node, sourceFile, /*includeJsDoc*/ true) > pos) {
                         break outer;
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
@@ -125023,14 +127933,14 @@ var ts;
                         //    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) || ts.isTemplateTail(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) {
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1
+                            || ts.isJSDocTypeExpression(node) || ts.isJSDocSignature(node) || ts.isJSDocTypeLiteral(node)) {
                             parentNode = node;
                             break;
                         }
@@ -125042,15 +127952,12 @@ var ts;
                         }
                         // 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)
+                        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);
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : getEndPos(sourceFile, node);
+                        if (ts.hasJSDocNodes(node) && ((_a = node.jsDoc) === null || _a === void 0 ? void 0 : _a.length)) {
+                            pushSelectionRange(ts.first(node.jsDoc).getStart(), end);
                         }
                         pushSelectionRange(start, end);
                         // String literals should have a stop both inside and outside their quotes.
@@ -125138,14 +128045,14 @@ var ts;
                 ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
                 // Group `-/+readonly` and `-/+?`
                 var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
-                    return child === node.readonlyToken || child.kind === 141 /* ReadonlyKeyword */ ||
+                    return child === node.readonlyToken || child.kind === 142 /* ReadonlyKeyword */ ||
                         child === node.questionToken || child.kind === 57 /* QuestionToken */;
                 });
                 // Group type parameter with surrounding brackets
                 var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
                     var kind = _a.kind;
                     return kind === 22 /* OpenBracketToken */ ||
-                        kind === 158 /* TypeParameter */ ||
+                        kind === 159 /* TypeParameter */ ||
                         kind === 23 /* CloseBracketToken */;
                 });
                 return [
@@ -125259,14 +128166,26 @@ var ts;
             return kind === 18 /* OpenBraceToken */
                 || kind === 22 /* OpenBracketToken */
                 || kind === 20 /* OpenParenToken */
-                || kind === 272 /* JsxOpeningElement */;
+                || kind === 275 /* JsxOpeningElement */;
         }
         function isListCloser(token) {
             var kind = token && token.kind;
             return kind === 19 /* CloseBraceToken */
                 || kind === 23 /* CloseBracketToken */
                 || kind === 21 /* CloseParenToken */
-                || kind === 273 /* JsxClosingElement */;
+                || kind === 276 /* JsxClosingElement */;
+        }
+        function getEndPos(sourceFile, node) {
+            switch (node.kind) {
+                case 326 /* JSDocParameterTag */:
+                case 324 /* JSDocCallbackTag */:
+                case 333 /* JSDocPropertyTag */:
+                case 331 /* JSDocTypedefTag */:
+                case 328 /* JSDocThisTag */:
+                    return sourceFile.getLineEndOfPosition(node.getStart());
+                default:
+                    return node.getEnd();
+            }
         }
     })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
 })(ts || (ts = {}));
@@ -125472,10 +128391,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 202 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 205 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 215 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 218 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -125544,17 +128463,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 204 /* ParenthesizedExpression */:
-                case 164 /* MethodDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
+                case 207 /* ParenthesizedExpression */:
+                case 165 /* MethodDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* 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 213 /* BinaryExpression */: {
+                case 216 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -125678,7 +128597,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 === 215 /* TemplateExpression */) {
+            if (template.kind === 218 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -126030,7 +128949,7 @@ var ts;
         return diags.sort(function (d1, d2) { return d1.start - d2.start; });
         function check(node) {
             if (isJsFile) {
-                if (canBeConvertedToClass(node)) {
+                if (canBeConvertedToClass(node, checker)) {
                     diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
                 }
             }
@@ -126059,11 +128978,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 230 /* ExpressionStatement */: {
+                case 233 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -126080,12 +128999,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 258 /* ImportDeclaration */:
+            case 261 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 260 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 263 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 257 /* ImportEqualsDeclaration */:
+            case 260 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -126154,9 +129073,9 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 248 /* FunctionDeclaration */:
-            case 205 /* FunctionExpression */:
-            case 206 /* ArrowFunction */:
+            case 251 /* FunctionDeclaration */:
+            case 208 /* FunctionExpression */:
+            case 209 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             // falls through
             case 103 /* NullKeyword */:
@@ -126169,17 +129088,16 @@ var ts;
     function getKeyFromNode(exp) {
         return exp.pos.toString() + ":" + exp.end.toString();
     }
-    function canBeConvertedToClass(node) {
+    function canBeConvertedToClass(node, checker) {
         var _a, _b, _c, _d;
-        if (node.kind === 205 /* FunctionExpression */) {
+        if (node.kind === 208 /* FunctionExpression */) {
             if (ts.isVariableDeclaration(node.parent) && ((_a = node.symbol.members) === null || _a === void 0 ? void 0 : _a.size)) {
                 return true;
             }
-            var decl = ts.getDeclarationOfExpando(node);
-            var symbol = decl === null || decl === void 0 ? void 0 : decl.symbol;
+            var symbol = checker.getSymbolOfExpando(node, /*allowDeclaration*/ false);
             return !!(symbol && (((_b = symbol.exports) === null || _b === void 0 ? void 0 : _b.size) || ((_c = symbol.members) === null || _c === void 0 ? void 0 : _c.size)));
         }
-        if (node.kind === 248 /* FunctionDeclaration */) {
+        if (node.kind === 251 /* FunctionDeclaration */) {
             return !!((_d = node.symbol.members) === null || _d === void 0 ? void 0 : _d.size);
         }
         return false;
@@ -126199,7 +129117,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 218 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 221 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -126285,11 +129203,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 272 /* JsxOpeningElement */:
-                    case 270 /* JsxElement */:
-                    case 271 /* JsxSelfClosingElement */:
+                    case 275 /* JsxOpeningElement */:
+                    case 273 /* JsxElement */:
+                    case 274 /* JsxSelfClosingElement */:
                         return location.kind === 78 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 277 /* JsxAttribute */:
+                    case 280 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -126333,7 +129251,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 198 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 201 /* 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)) {
@@ -126353,7 +129271,7 @@ var ts;
                 }
                 if (callExpressionLike) {
                     signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 201 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 105 /* SuperKeyword */);
+                    var useConstructSignatures = callExpressionLike.kind === 204 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 105 /* 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
@@ -126409,7 +129327,7 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 132 /* ConstructorKeyword */ && location.parent.kind === 165 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 132 /* ConstructorKeyword */ && location.parent.kind === 166 /* 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
@@ -126417,21 +129335,21 @@ var ts;
                         return declaration === (location.kind === 132 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 165 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 166 /* 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 === 165 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 166 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 168 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 169 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -126442,7 +129360,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 218 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 221 /* 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>
@@ -126465,7 +129383,7 @@ var ts;
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(148 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(149 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -126486,9 +129404,9 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 253 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 256 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 78 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 139 /* NamespaceKeyword */ : 138 /* ModuleKeyword */));
+                displayParts.push(ts.keywordPart(isNamespace ? 140 /* NamespaceKeyword */ : 139 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -126507,7 +129425,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 158 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 159 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -126515,21 +129433,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 169 /* ConstructSignature */) {
+                            if (declaration.kind === 170 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(102 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 168 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 169 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 251 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 254 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(148 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(149 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -126541,7 +129459,7 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 288 /* EnumMember */) {
+                if (declaration.kind === 291 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -126572,17 +129490,17 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 256 /* NamespaceExportDeclaration */:
+                    case 259 /* NamespaceExportDeclaration */:
                         displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(139 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(140 /* NamespaceKeyword */));
                         break;
-                    case 263 /* ExportAssignment */:
+                    case 266 /* ExportAssignment */:
                         displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 62 /* EqualsToken */ : 87 /* DefaultKeyword */));
                         break;
-                    case 267 /* ExportSpecifier */:
+                    case 270 /* ExportSpecifier */:
                         displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
                         break;
                     default:
@@ -126591,13 +129509,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 257 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 260 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(62 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(142 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(143 /* 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 */));
@@ -126678,10 +129596,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 === 294 /* SourceFile */; })) {
+                if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 297 /* SourceFile */; })) {
                     for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (!declaration.parent || declaration.parent.kind !== 213 /* BinaryExpression */) {
+                        if (!declaration.parent || declaration.parent.kind !== 216 /* BinaryExpression */) {
                             continue;
                         }
                         var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -126799,16 +129717,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 205 /* FunctionExpression */) {
+                if (declaration.kind === 208 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 246 /* VariableDeclaration */ && declaration.kind !== 248 /* FunctionDeclaration */) {
+                if (declaration.kind !== 249 /* VariableDeclaration */ && declaration.kind !== 251 /* 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 === 294 /* SourceFile */ || parent.kind === 254 /* ModuleBlock */) {
+                    if (parent.kind === 297 /* SourceFile */ || parent.kind === 257 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -127109,10 +130027,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 277 /* JsxAttribute */:
-                        case 272 /* JsxOpeningElement */:
-                        case 273 /* JsxClosingElement */:
-                        case 271 /* JsxSelfClosingElement */:
+                        case 280 /* JsxAttribute */:
+                        case 275 /* JsxOpeningElement */:
+                        case 276 /* JsxClosingElement */:
+                        case 274 /* 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 === 78 /* Identifier */;
                     }
@@ -127313,7 +130231,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 155 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 156 /* LastToken */; token++) {
                 if (token !== 1 /* EndOfFileToken */) {
                     allTokens.push(token);
                 }
@@ -127328,9 +130246,9 @@ var ts;
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(__spreadArrays(allTokens, [3 /* MultiLineCommentTrivia */]));
             var anyTokenIncludingEOF = tokenRangeFrom(__spreadArrays(allTokens, [1 /* EndOfFileToken */]));
-            var keywords = tokenRangeFromRange(80 /* FirstKeyword */, 155 /* LastKeyword */);
+            var keywords = tokenRangeFromRange(80 /* FirstKeyword */, 156 /* LastKeyword */);
             var binaryOperators = tokenRangeFromRange(29 /* FirstBinaryOperator */, 77 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [100 /* InKeyword */, 101 /* InstanceOfKeyword */, 155 /* OfKeyword */, 126 /* AsKeyword */, 136 /* IsKeyword */];
+            var binaryKeywordOperators = [100 /* InKeyword */, 101 /* InstanceOfKeyword */, 156 /* OfKeyword */, 126 /* AsKeyword */, 137 /* IsKeyword */];
             var unaryPrefixOperators = [45 /* PlusPlusToken */, 46 /* MinusMinusToken */, 54 /* TildeToken */, 53 /* ExclamationToken */];
             var unaryPrefixExpressions = [
                 8 /* NumericLiteral */, 9 /* BigIntLiteral */, 78 /* Identifier */, 20 /* OpenParenToken */,
@@ -127404,7 +130322,7 @@ var ts;
                 // 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", [134 /* GetKeyword */, 145 /* SetKeyword */], 78 /* Identifier */, [isFunctionDeclContext], 4 /* InsertSpace */),
+                rule("SpaceAfterGetSetInMember", [134 /* GetKeyword */, 146 /* SetKeyword */], 78 /* Identifier */, [isFunctionDeclContext], 4 /* InsertSpace */),
                 rule("NoSpaceBetweenYieldKeywordAndStar", 124 /* YieldKeyword */, 41 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 16 /* DeleteSpace */),
                 rule("SpaceBetweenYieldOrYieldStarAndOperand", [124 /* YieldKeyword */, 41 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 4 /* InsertSpace */),
                 rule("NoSpaceBetweenReturnAndSemicolon", 104 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
@@ -127428,7 +130346,7 @@ var ts;
                 rule("NoSpaceAfterEqualInJsxAttribute", 62 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [138 /* ModuleKeyword */, 142 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
+                rule("NoSpaceAfterModuleImport", [139 /* ModuleKeyword */, 143 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
                     125 /* AbstractKeyword */,
@@ -127442,20 +130360,20 @@ var ts;
                     116 /* ImplementsKeyword */,
                     99 /* ImportKeyword */,
                     117 /* InterfaceKeyword */,
-                    138 /* ModuleKeyword */,
-                    139 /* NamespaceKeyword */,
+                    139 /* ModuleKeyword */,
+                    140 /* NamespaceKeyword */,
                     120 /* PrivateKeyword */,
                     122 /* PublicKeyword */,
                     121 /* ProtectedKeyword */,
-                    141 /* ReadonlyKeyword */,
-                    145 /* SetKeyword */,
+                    142 /* ReadonlyKeyword */,
+                    146 /* SetKeyword */,
                     123 /* StaticKeyword */,
-                    148 /* TypeKeyword */,
-                    152 /* FromKeyword */,
-                    137 /* KeyOfKeyword */,
+                    149 /* TypeKeyword */,
+                    153 /* FromKeyword */,
+                    138 /* KeyOfKeyword */,
                     135 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [93 /* ExtendsKeyword */, 116 /* ImplementsKeyword */, 152 /* FromKeyword */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [93 /* ExtendsKeyword */, 116 /* ImplementsKeyword */, 153 /* FromKeyword */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */),
                 // 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], 4 /* InsertSpace */),
                 // Lambda expressions
@@ -127487,7 +130405,7 @@ var ts;
                     120 /* PrivateKeyword */,
                     121 /* ProtectedKeyword */,
                     134 /* GetKeyword */,
-                    145 /* SetKeyword */,
+                    146 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     41 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 4 /* InsertSpace */),
@@ -127641,51 +130559,51 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 234 /* ForStatement */;
+            return context.contextNode.kind === 237 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                     return context.contextNode.operatorToken.kind !== 27 /* CommaToken */;
-                case 214 /* ConditionalExpression */:
-                case 183 /* ConditionalType */:
-                case 221 /* AsExpression */:
-                case 267 /* ExportSpecifier */:
-                case 262 /* ImportSpecifier */:
-                case 171 /* TypePredicate */:
-                case 181 /* UnionType */:
-                case 182 /* IntersectionType */:
+                case 217 /* ConditionalExpression */:
+                case 184 /* ConditionalType */:
+                case 224 /* AsExpression */:
+                case 270 /* ExportSpecifier */:
+                case 265 /* ImportSpecifier */:
+                case 172 /* TypePredicate */:
+                case 182 /* UnionType */:
+                case 183 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                 // equals in type X = ...
                 // falls through
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
                 // falls through
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                 // equal in let a = 0
                 // falls through
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                 // equal in p = 0
                 // falls through
-                case 159 /* Parameter */:
-                case 288 /* EnumMember */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
+                case 160 /* Parameter */:
+                case 291 /* EnumMember */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
                     return context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 235 /* ForInStatement */:
+                case 238 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
                 // falls through
-                case 158 /* TypeParameter */:
+                case 159 /* TypeParameter */:
                     return context.currentTokenSpan.kind === 100 /* InKeyword */ || context.nextTokenSpan.kind === 100 /* InKeyword */ || context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 236 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 155 /* OfKeyword */ || context.nextTokenSpan.kind === 155 /* OfKeyword */;
+                case 239 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 156 /* OfKeyword */ || context.nextTokenSpan.kind === 156 /* OfKeyword */;
             }
             return false;
         }
@@ -127697,22 +130615,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 162 /* PropertyDeclaration */ ||
-                contextKind === 161 /* PropertySignature */ ||
-                contextKind === 159 /* Parameter */ ||
-                contextKind === 246 /* VariableDeclaration */ ||
+            return contextKind === 163 /* PropertyDeclaration */ ||
+                contextKind === 162 /* PropertySignature */ ||
+                contextKind === 160 /* Parameter */ ||
+                contextKind === 249 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 214 /* ConditionalExpression */ ||
-                context.contextNode.kind === 183 /* ConditionalType */;
+            return context.contextNode.kind === 217 /* ConditionalExpression */ ||
+                context.contextNode.kind === 184 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 193 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 189 /* MappedType */ ||
+            return context.contextNode.kind === 196 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 190 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -127738,34 +130656,34 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 227 /* Block */:
-                case 255 /* CaseBlock */:
-                case 197 /* ObjectLiteralExpression */:
-                case 254 /* ModuleBlock */:
+                case 230 /* Block */:
+                case 258 /* CaseBlock */:
+                case 200 /* ObjectLiteralExpression */:
+                case 257 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
+                case 251 /* FunctionDeclaration */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
                 // falls through
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */:
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
                 // falls through
-                case 168 /* CallSignature */:
-                case 205 /* FunctionExpression */:
-                case 165 /* Constructor */:
-                case 206 /* ArrowFunction */:
+                case 169 /* CallSignature */:
+                case 208 /* FunctionExpression */:
+                case 166 /* Constructor */:
+                case 209 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
                 // falls through
-                case 250 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 253 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -127774,40 +130692,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 248 /* FunctionDeclaration */ || context.contextNode.kind === 205 /* FunctionExpression */;
+            return context.contextNode.kind === 251 /* FunctionDeclaration */ || context.contextNode.kind === 208 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 250 /* InterfaceDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 176 /* TypeLiteral */:
-                case 253 /* ModuleDeclaration */:
-                case 264 /* ExportDeclaration */:
-                case 265 /* NamedExports */:
-                case 258 /* ImportDeclaration */:
-                case 261 /* NamedImports */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 253 /* InterfaceDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 177 /* TypeLiteral */:
+                case 256 /* ModuleDeclaration */:
+                case 267 /* ExportDeclaration */:
+                case 268 /* NamedExports */:
+                case 261 /* ImportDeclaration */:
+                case 264 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 249 /* ClassDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 284 /* CatchClause */:
-                case 254 /* ModuleBlock */:
-                case 241 /* SwitchStatement */:
+                case 252 /* ClassDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 287 /* CatchClause */:
+                case 257 /* ModuleBlock */:
+                case 244 /* SwitchStatement */:
                     return true;
-                case 227 /* Block */: {
+                case 230 /* 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 !== 206 /* ArrowFunction */ && blockParent.kind !== 205 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 209 /* ArrowFunction */ && blockParent.kind !== 208 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -127816,32 +130734,32 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 231 /* IfStatement */:
-                case 241 /* SwitchStatement */:
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
-                case 233 /* WhileStatement */:
-                case 244 /* TryStatement */:
-                case 232 /* DoStatement */:
-                case 240 /* WithStatement */:
+                case 234 /* IfStatement */:
+                case 244 /* SwitchStatement */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
+                case 236 /* WhileStatement */:
+                case 247 /* TryStatement */:
+                case 235 /* DoStatement */:
+                case 243 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
                 // falls through
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 197 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 200 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 200 /* CallExpression */;
+            return context.contextNode.kind === 203 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 201 /* NewExpression */;
+            return context.contextNode.kind === 204 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -127856,10 +130774,10 @@ var ts;
             return context.nextTokenSpan.kind !== 21 /* CloseParenToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 206 /* ArrowFunction */;
+            return context.contextNode.kind === 209 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 192 /* ImportType */;
+            return context.contextNode.kind === 195 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
@@ -127868,19 +130786,19 @@ var ts;
             return context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 270 /* JsxElement */ && context.contextNode.kind !== 274 /* JsxFragment */;
+            return context.contextNode.kind !== 273 /* JsxElement */ && context.contextNode.kind !== 277 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 280 /* JsxExpression */ || context.contextNode.kind === 279 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 283 /* JsxExpression */ || context.contextNode.kind === 282 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 277 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 280 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 277 /* JsxAttribute */;
+            return context.contextNode.kind === 280 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 271 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 274 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -127895,45 +130813,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 160 /* Decorator */;
+            return node.kind === 161 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 247 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 250 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 253 /* ModuleDeclaration */;
+            return context.contextNode.kind === 256 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 176 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 177 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 169 /* ConstructSignature */;
+            return context.contextNode.kind === 170 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 29 /* LessThanToken */ && token.kind !== 31 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 172 /* TypeReference */:
-                case 203 /* TypeAssertionExpression */:
-                case 251 /* TypeAliasDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 218 /* ClassExpression */:
-                case 250 /* InterfaceDeclaration */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 200 /* CallExpression */:
-                case 201 /* NewExpression */:
-                case 220 /* ExpressionWithTypeArguments */:
+                case 173 /* TypeReference */:
+                case 206 /* TypeAssertionExpression */:
+                case 254 /* TypeAliasDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 221 /* ClassExpression */:
+                case 253 /* InterfaceDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 203 /* CallExpression */:
+                case 204 /* NewExpression */:
+                case 223 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -127944,28 +130862,28 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 203 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 206 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 113 /* VoidKeyword */ && context.currentTokenParent.kind === 209 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 113 /* VoidKeyword */ && context.currentTokenParent.kind === 212 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 216 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 219 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 222 /* NonNullExpression */;
+            return context.contextNode.kind === 225 /* NonNullExpression */;
         }
         function isNotStatementConditionContext(context) {
             return !isStatementConditionContext(context);
         }
         function isStatementConditionContext(context) {
             switch (context.contextNode.kind) {
-                case 231 /* IfStatement */:
-                case 234 /* ForStatement */:
-                case 235 /* ForInStatement */:
-                case 236 /* ForOfStatement */:
-                case 232 /* DoStatement */:
-                case 233 /* WhileStatement */:
+                case 234 /* IfStatement */:
+                case 237 /* ForStatement */:
+                case 238 /* ForInStatement */:
+                case 239 /* ForOfStatement */:
+                case 235 /* DoStatement */:
+                case 236 /* WhileStatement */:
                     return true;
                 default:
                     return false;
@@ -127990,12 +130908,12 @@ var ts;
                 return nextTokenKind === 19 /* CloseBraceToken */
                     || nextTokenKind === 1 /* EndOfFileToken */;
             }
-            if (nextTokenKind === 226 /* SemicolonClassElement */ ||
+            if (nextTokenKind === 229 /* SemicolonClassElement */ ||
                 nextTokenKind === 26 /* SemicolonToken */) {
                 return false;
             }
-            if (context.contextNode.kind === 250 /* InterfaceDeclaration */ ||
-                context.contextNode.kind === 251 /* TypeAliasDeclaration */) {
+            if (context.contextNode.kind === 253 /* InterfaceDeclaration */ ||
+                context.contextNode.kind === 254 /* TypeAliasDeclaration */) {
                 // Can’t remove semicolon after `foo`; it would parse as a method declaration:
                 //
                 // interface I {
@@ -128009,9 +130927,9 @@ var ts;
             if (ts.isPropertyDeclaration(context.currentTokenParent)) {
                 return !context.currentTokenParent.initializer;
             }
-            return context.currentTokenParent.kind !== 234 /* ForStatement */
-                && context.currentTokenParent.kind !== 228 /* EmptyStatement */
-                && context.currentTokenParent.kind !== 226 /* SemicolonClassElement */
+            return context.currentTokenParent.kind !== 237 /* ForStatement */
+                && context.currentTokenParent.kind !== 231 /* EmptyStatement */
+                && context.currentTokenParent.kind !== 229 /* SemicolonClassElement */
                 && nextTokenKind !== 22 /* OpenBracketToken */
                 && nextTokenKind !== 20 /* OpenParenToken */
                 && nextTokenKind !== 39 /* PlusToken */
@@ -128019,7 +130937,7 @@ var ts;
                 && nextTokenKind !== 43 /* SlashToken */
                 && nextTokenKind !== 13 /* RegularExpressionLiteral */
                 && nextTokenKind !== 27 /* CommaToken */
-                && nextTokenKind !== 215 /* TemplateExpression */
+                && nextTokenKind !== 218 /* TemplateExpression */
                 && nextTokenKind !== 15 /* TemplateHead */
                 && nextTokenKind !== 14 /* NoSubstitutionTemplateLiteral */
                 && nextTokenKind !== 24 /* DotToken */;
@@ -128110,12 +131028,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 155 /* LastKeyword */ && column <= 155 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 156 /* LastKeyword */ && column <= 156 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 155 /* LastToken */ + 1;
+        var mapRowLength = 156 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["StopRulesSpecific"] = 0] = "StopRulesSpecific";
@@ -128303,17 +131221,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 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 254 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 294 /* SourceFile */:
-                case 227 /* Block */:
-                case 254 /* ModuleBlock */:
+                    return !!body && body.kind === 257 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 297 /* SourceFile */:
+                case 230 /* Block */:
+                case 257 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 284 /* CatchClause */:
+                case 287 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -128540,19 +131458,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 249 /* ClassDeclaration */: return 83 /* ClassKeyword */;
-                    case 250 /* InterfaceDeclaration */: return 117 /* InterfaceKeyword */;
-                    case 248 /* FunctionDeclaration */: return 97 /* FunctionKeyword */;
-                    case 252 /* EnumDeclaration */: return 252 /* EnumDeclaration */;
-                    case 166 /* GetAccessor */: return 134 /* GetKeyword */;
-                    case 167 /* SetAccessor */: return 145 /* SetKeyword */;
-                    case 164 /* MethodDeclaration */:
+                    case 252 /* ClassDeclaration */: return 83 /* ClassKeyword */;
+                    case 253 /* InterfaceDeclaration */: return 117 /* InterfaceKeyword */;
+                    case 251 /* FunctionDeclaration */: return 97 /* FunctionKeyword */;
+                    case 255 /* EnumDeclaration */: return 255 /* EnumDeclaration */;
+                    case 167 /* GetAccessor */: return 134 /* GetKeyword */;
+                    case 168 /* SetAccessor */: return 146 /* SetKeyword */;
+                    case 165 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 41 /* AsteriskToken */;
                         }
                     // falls through
-                    case 162 /* PropertyDeclaration */:
-                    case 159 /* Parameter */:
+                    case 163 /* PropertyDeclaration */:
+                    case 160 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -128609,15 +131527,15 @@ var ts;
                         case 43 /* SlashToken */:
                         case 31 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 272 /* JsxOpeningElement */:
-                                case 273 /* JsxClosingElement */:
-                                case 271 /* JsxSelfClosingElement */:
+                                case 275 /* JsxOpeningElement */:
+                                case 276 /* JsxClosingElement */:
+                                case 274 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 189 /* MappedType */) {
+                            if (container.kind !== 190 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -128725,7 +131643,7 @@ var ts;
                             return inheritedIndentation;
                         }
                     }
-                    var effectiveParentStartLine = child.kind === 160 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 161 /* 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 */) {
@@ -128745,7 +131663,7 @@ var ts;
                         }
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 196 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 199 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -129185,12 +132103,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 165 /* Constructor */:
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 206 /* ArrowFunction */:
+                case 166 /* Constructor */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 209 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 29 /* LessThanToken */;
                     }
@@ -129198,8 +132116,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 200 /* CallExpression */:
-                case 201 /* NewExpression */:
+                case 203 /* CallExpression */:
+                case 204 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 29 /* LessThanToken */;
                     }
@@ -129207,12 +132125,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 29 /* LessThanToken */;
                     }
                     break;
-                case 176 /* TypeLiteral */:
+                case 177 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -129330,7 +132248,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 213 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 216 /* 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 */) {
@@ -129484,7 +132402,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 === 294 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 297 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -129532,7 +132450,7 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 231 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 234 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 90 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -129570,40 +132488,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 172 /* TypeReference */:
+                    case 173 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 197 /* ObjectLiteralExpression */:
+                    case 200 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 196 /* ArrayLiteralExpression */:
+                    case 199 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 176 /* TypeLiteral */:
+                    case 177 /* TypeLiteral */:
                         return getList(node.members);
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
-                    case 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
-                    case 168 /* CallSignature */:
-                    case 165 /* Constructor */:
-                    case 174 /* ConstructorType */:
-                    case 169 /* ConstructSignature */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
+                    case 169 /* CallSignature */:
+                    case 166 /* Constructor */:
+                    case 175 /* ConstructorType */:
+                    case 170 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 326 /* JSDocTemplateTag */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 330 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 201 /* NewExpression */:
-                    case 200 /* CallExpression */:
+                    case 204 /* NewExpression */:
+                    case 203 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 247 /* VariableDeclarationList */:
+                    case 250 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 261 /* NamedImports */:
-                    case 265 /* NamedExports */:
+                    case 264 /* NamedImports */:
+                    case 268 /* NamedExports */:
                         return getList(node.elements);
-                    case 193 /* ObjectBindingPattern */:
-                    case 194 /* ArrayBindingPattern */:
+                    case 196 /* ObjectBindingPattern */:
+                    case 197 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -129626,7 +132544,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 247 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 250 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -129699,87 +132617,91 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 230 /* ExpressionStatement */:
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 252 /* EnumDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 196 /* ArrayLiteralExpression */:
-                    case 227 /* Block */:
-                    case 254 /* ModuleBlock */:
-                    case 197 /* ObjectLiteralExpression */:
-                    case 176 /* TypeLiteral */:
-                    case 189 /* MappedType */:
-                    case 178 /* TupleType */:
-                    case 255 /* CaseBlock */:
-                    case 282 /* DefaultClause */:
-                    case 281 /* CaseClause */:
-                    case 204 /* ParenthesizedExpression */:
-                    case 198 /* PropertyAccessExpression */:
-                    case 200 /* CallExpression */:
-                    case 201 /* NewExpression */:
-                    case 229 /* VariableStatement */:
-                    case 263 /* ExportAssignment */:
-                    case 239 /* ReturnStatement */:
-                    case 214 /* ConditionalExpression */:
-                    case 194 /* ArrayBindingPattern */:
-                    case 193 /* ObjectBindingPattern */:
-                    case 272 /* JsxOpeningElement */:
-                    case 275 /* JsxOpeningFragment */:
-                    case 271 /* JsxSelfClosingElement */:
-                    case 280 /* JsxExpression */:
-                    case 163 /* MethodSignature */:
-                    case 168 /* CallSignature */:
-                    case 169 /* ConstructSignature */:
-                    case 159 /* Parameter */:
-                    case 173 /* FunctionType */:
-                    case 174 /* ConstructorType */:
-                    case 185 /* ParenthesizedType */:
-                    case 202 /* TaggedTemplateExpression */:
-                    case 210 /* AwaitExpression */:
-                    case 265 /* NamedExports */:
-                    case 261 /* NamedImports */:
-                    case 267 /* ExportSpecifier */:
-                    case 262 /* ImportSpecifier */:
-                    case 162 /* PropertyDeclaration */:
+                    case 233 /* ExpressionStatement */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 199 /* ArrayLiteralExpression */:
+                    case 230 /* Block */:
+                    case 257 /* ModuleBlock */:
+                    case 200 /* ObjectLiteralExpression */:
+                    case 177 /* TypeLiteral */:
+                    case 190 /* MappedType */:
+                    case 179 /* TupleType */:
+                    case 258 /* CaseBlock */:
+                    case 285 /* DefaultClause */:
+                    case 284 /* CaseClause */:
+                    case 207 /* ParenthesizedExpression */:
+                    case 201 /* PropertyAccessExpression */:
+                    case 203 /* CallExpression */:
+                    case 204 /* NewExpression */:
+                    case 232 /* VariableStatement */:
+                    case 266 /* ExportAssignment */:
+                    case 242 /* ReturnStatement */:
+                    case 217 /* ConditionalExpression */:
+                    case 197 /* ArrayBindingPattern */:
+                    case 196 /* ObjectBindingPattern */:
+                    case 275 /* JsxOpeningElement */:
+                    case 278 /* JsxOpeningFragment */:
+                    case 274 /* JsxSelfClosingElement */:
+                    case 283 /* JsxExpression */:
+                    case 164 /* MethodSignature */:
+                    case 169 /* CallSignature */:
+                    case 170 /* ConstructSignature */:
+                    case 160 /* Parameter */:
+                    case 174 /* FunctionType */:
+                    case 175 /* ConstructorType */:
+                    case 186 /* ParenthesizedType */:
+                    case 205 /* TaggedTemplateExpression */:
+                    case 213 /* AwaitExpression */:
+                    case 268 /* NamedExports */:
+                    case 264 /* NamedImports */:
+                    case 270 /* ExportSpecifier */:
+                    case 265 /* ImportSpecifier */:
+                    case 163 /* PropertyDeclaration */:
                         return true;
-                    case 246 /* VariableDeclaration */:
-                    case 285 /* PropertyAssignment */:
-                    case 213 /* BinaryExpression */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 197 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 249 /* VariableDeclaration */:
+                    case 288 /* PropertyAssignment */:
+                    case 216 /* BinaryExpression */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 200 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
-                        if (parent.kind !== 213 /* BinaryExpression */) {
+                        if (parent.kind !== 216 /* BinaryExpression */) {
                             return true;
                         }
                         break;
-                    case 232 /* DoStatement */:
-                    case 233 /* WhileStatement */:
-                    case 235 /* ForInStatement */:
-                    case 236 /* ForOfStatement */:
-                    case 234 /* ForStatement */:
-                    case 231 /* IfStatement */:
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
-                    case 164 /* MethodDeclaration */:
-                    case 206 /* ArrowFunction */:
-                    case 165 /* Constructor */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                        return childKind !== 227 /* Block */;
-                    case 264 /* ExportDeclaration */:
-                        return childKind !== 265 /* NamedExports */;
-                    case 258 /* ImportDeclaration */:
-                        return childKind !== 259 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 261 /* NamedImports */);
-                    case 270 /* JsxElement */:
-                        return childKind !== 273 /* JsxClosingElement */;
-                    case 274 /* JsxFragment */:
-                        return childKind !== 276 /* JsxClosingFragment */;
-                    case 182 /* IntersectionType */:
-                    case 181 /* UnionType */:
-                        if (childKind === 176 /* TypeLiteral */ || childKind === 178 /* TupleType */) {
+                    case 235 /* DoStatement */:
+                    case 236 /* WhileStatement */:
+                    case 238 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
+                    case 237 /* ForStatement */:
+                    case 234 /* IfStatement */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 165 /* MethodDeclaration */:
+                    case 166 /* Constructor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                        return childKind !== 230 /* Block */;
+                    case 209 /* ArrowFunction */:
+                        if (sourceFile && childKind === 207 /* ParenthesizedExpression */) {
+                            return rangeIsOnOneLine(sourceFile, child);
+                        }
+                        return childKind !== 230 /* Block */;
+                    case 267 /* ExportDeclaration */:
+                        return childKind !== 268 /* NamedExports */;
+                    case 261 /* ImportDeclaration */:
+                        return childKind !== 262 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 264 /* NamedImports */);
+                    case 273 /* JsxElement */:
+                        return childKind !== 276 /* JsxClosingElement */;
+                    case 277 /* JsxFragment */:
+                        return childKind !== 279 /* JsxClosingFragment */;
+                    case 183 /* IntersectionType */:
+                    case 182 /* UnionType */:
+                        if (childKind === 177 /* TypeLiteral */ || childKind === 179 /* TupleType */) {
                             return false;
                         }
                     // falls through
@@ -129790,11 +132712,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 239 /* ReturnStatement */:
-                    case 243 /* ThrowStatement */:
-                    case 237 /* ContinueStatement */:
-                    case 238 /* BreakStatement */:
-                        return parent.kind !== 227 /* Block */;
+                    case 242 /* ReturnStatement */:
+                    case 246 /* ThrowStatement */:
+                    case 240 /* ContinueStatement */:
+                    case 241 /* BreakStatement */:
+                        return parent.kind !== 230 /* Block */;
                     default:
                         return false;
                 }
@@ -129868,8 +132790,10 @@ var ts;
         (function (TrailingTriviaOption) {
             /** Exclude all trailing trivia (use getEnd()) */
             TrailingTriviaOption[TrailingTriviaOption["Exclude"] = 0] = "Exclude";
+            /** Doesn't include whitespace, but does strip comments */
+            TrailingTriviaOption[TrailingTriviaOption["ExcludeWhitespace"] = 1] = "ExcludeWhitespace";
             /** Include trailing trivia */
-            TrailingTriviaOption[TrailingTriviaOption["Include"] = 1] = "Include";
+            TrailingTriviaOption[TrailingTriviaOption["Include"] = 2] = "Include";
         })(TrailingTriviaOption = textChanges_3.TrailingTriviaOption || (textChanges_3.TrailingTriviaOption = {}));
         function skipWhitespacesAndLineBreaks(text, start) {
             return ts.skipTrivia(text, start, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
@@ -129940,9 +132864,18 @@ var ts;
             return ts.getStartPositionOfLine(ts.getLineOfLocalPosition(sourceFile, adjustedStartPosition), sourceFile);
         }
         function getAdjustedEndPosition(sourceFile, node, options) {
+            var _a;
             var end = node.end;
             var trailingTriviaOption = options.trailingTriviaOption;
-            if (trailingTriviaOption === TrailingTriviaOption.Exclude || (ts.isExpression(node) && trailingTriviaOption !== TrailingTriviaOption.Include)) {
+            if (trailingTriviaOption === TrailingTriviaOption.Exclude) {
+                return end;
+            }
+            if (trailingTriviaOption === TrailingTriviaOption.ExcludeWhitespace) {
+                var comments = ts.concatenate(ts.getTrailingCommentRanges(sourceFile.text, end), ts.getLeadingCommentRanges(sourceFile.text, end));
+                var realEnd = (_a = comments === null || comments === void 0 ? void 0 : comments[comments.length - 1]) === null || _a === void 0 ? void 0 : _a.end;
+                if (realEnd) {
+                    return realEnd;
+                }
                 return end;
             }
             var newEnd = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true);
@@ -129954,7 +132887,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 === 197 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 200 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -130093,9 +133026,10 @@ var ts;
                     this.insertNodeAt(sourceFile, parameters.pos, newParam);
                 }
             };
-            ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
+            ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween, options) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
+                if (options === void 0) { options = {}; }
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, options), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -130157,7 +133091,7 @@ var ts;
                     }
                 }
                 else {
-                    endNode = (_a = (node.kind === 246 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name;
+                    endNode = (_a = (node.kind === 249 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
                 return true;
@@ -130314,18 +133248,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 249 /* ClassDeclaration */:
-                    case 253 /* ModuleDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 246 /* VariableDeclaration */:
+                    case 249 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
                     case 78 /* Identifier */:
                         return { prefix: ", " };
-                    case 285 /* PropertyAssignment */:
+                    case 288 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
                     case 92 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 159 /* Parameter */:
+                    case 160 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -130334,7 +133268,7 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 206 /* ArrowFunction */) {
+                if (node.kind === 209 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 38 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
@@ -130348,14 +133282,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.factory.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 227 /* Block */) {
+                    if (node.body.kind !== 230 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
                         this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.factory.createToken(18 /* OpenBraceToken */), ts.factory.createToken(104 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.factory.createToken(26 /* SemicolonToken */), ts.factory.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 205 /* FunctionExpression */ ? 97 /* FunctionKeyword */ : 83 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 208 /* FunctionExpression */ ? 97 /* FunctionKeyword */ : 83 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.factory.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -130651,7 +133585,12 @@ var ts;
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, preserveSourceNewlines: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({
+                    newLine: newLine,
+                    neverAsciiEscape: true,
+                    preserveSourceNewlines: true,
+                    terminateUnterminatedLiterals: true
+                }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -130925,14 +133864,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 157 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 158 /* 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 159 /* Parameter */: {
+                    case 160 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -130947,15 +133886,15 @@ var ts;
                         }
                         break;
                     }
-                    case 258 /* ImportDeclaration */:
-                    case 257 /* ImportEqualsDeclaration */:
+                    case 261 /* ImportDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
                         var isFirstImport = sourceFile.imports.length && node === ts.first(sourceFile.imports).parent || node === ts.find(sourceFile.statements, ts.isAnyImportSyntax);
                         // For first import, leave header comment in place, otherwise only delete JSDoc comments
                         deleteNode(changes, sourceFile, node, { leadingTriviaOption: isFirstImport ? LeadingTriviaOption.Exclude : ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine });
                         break;
-                    case 195 /* BindingElement */:
+                    case 198 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 194 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 197 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -130963,13 +133902,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 246 /* VariableDeclaration */:
+                    case 249 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 158 /* TypeParameter */:
+                    case 159 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 262 /* ImportSpecifier */:
+                    case 265 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -130978,7 +133917,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 260 /* NamespaceImport */:
+                    case 263 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     case 26 /* SemicolonToken */:
@@ -130987,8 +133926,8 @@ var ts;
                     case 97 /* FunctionKeyword */:
                         deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
                         break;
-                    case 249 /* ClassDeclaration */:
-                    case 248 /* FunctionDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 251 /* FunctionDeclaration */:
                         deleteNode(changes, sourceFile, node, { leadingTriviaOption: ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine });
                         break;
                     default:
@@ -131035,13 +133974,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 258 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 261 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 284 /* CatchClause */) {
+                if (parent.kind === 287 /* 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;
@@ -131052,14 +133991,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 236 /* ForOfStatement */:
-                    case 235 /* ForInStatement */:
+                    case 239 /* ForOfStatement */:
+                    case 238 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.factory.createObjectLiteralExpression());
                         break;
-                    case 234 /* ForStatement */:
+                    case 237 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 229 /* VariableStatement */:
+                    case 232 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp, { leadingTriviaOption: ts.hasJSDocNodes(gp) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine });
                         break;
                     default:
@@ -131238,8 +134177,8 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.checkDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertionExpression(n); }), "Expected to find an assertion expression");
             var replacement = ts.isAsExpression(assertion)
-                ? ts.factory.createAsExpression(assertion.expression, ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */))
-                : ts.factory.createTypeAssertion(ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */), assertion.expression);
+                ? ts.factory.createAsExpression(assertion.expression, ts.factory.createKeywordTypeNode(152 /* UnknownKeyword */))
+                : ts.factory.createTypeAssertion(ts.factory.createKeywordTypeNode(152 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -131468,7 +134407,7 @@ var ts;
                 }
                 var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
                 var variableName = declaration && ts.tryCast(declaration.name, ts.isIdentifier);
-                var variableStatement = ts.getAncestor(declaration, 229 /* VariableStatement */);
+                var variableStatement = ts.getAncestor(declaration, 232 /* VariableStatement */);
                 if (!declaration || !variableStatement ||
                     declaration.type ||
                     !declaration.initializer ||
@@ -131546,10 +134485,10 @@ var ts;
         function isInsideAwaitableBody(node) {
             return node.kind & 32768 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) {
                 return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor ||
-                    ts.isBlock(ancestor) && (ancestor.parent.kind === 248 /* FunctionDeclaration */ ||
-                        ancestor.parent.kind === 205 /* FunctionExpression */ ||
-                        ancestor.parent.kind === 206 /* ArrowFunction */ ||
-                        ancestor.parent.kind === 164 /* MethodDeclaration */);
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 251 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 208 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 209 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 165 /* MethodDeclaration */);
             });
         }
         function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite, fixedDeclarations) {
@@ -131668,10 +134607,10 @@ var ts;
         function isPossiblyPartOfDestructuring(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 196 /* ArrayLiteralExpression */:
-                case 197 /* ObjectLiteralExpression */:
-                case 285 /* PropertyAssignment */:
-                case 286 /* ShorthandPropertyAssignment */:
+                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ObjectLiteralExpression */:
+                case 288 /* PropertyAssignment */:
+                case 289 /* ShorthandPropertyAssignment */:
                     return true;
                 default:
                     return false;
@@ -131686,7 +134625,7 @@ var ts;
         function isPossiblyPartOfCommaSeperatedInitializer(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 213 /* BinaryExpression */:
+                case 216 /* BinaryExpression */:
                 case 27 /* CommaToken */:
                     return true;
                 default:
@@ -131735,7 +134674,7 @@ var ts;
                 return;
             }
             var declaration = token.parent;
-            if (declaration.kind === 162 /* PropertyDeclaration */ &&
+            if (declaration.kind === 163 /* PropertyDeclaration */ &&
                 (!fixedNodes || ts.tryAddToSet(fixedNodes, declaration))) {
                 changeTracker.insertModifierBefore(sourceFile, 133 /* DeclareKeyword */, declaration);
             }
@@ -131872,26 +134811,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 246 /* VariableDeclaration */ ||
-                node.kind === 161 /* PropertySignature */ ||
-                node.kind === 162 /* PropertyDeclaration */;
+                node.kind === 249 /* VariableDeclaration */ ||
+                node.kind === 162 /* PropertySignature */ ||
+                node.kind === 163 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 299 /* JSDocAllType */:
-                case 300 /* JSDocUnknownType */:
+                case 303 /* JSDocAllType */:
+                case 304 /* JSDocUnknownType */:
                     return ts.factory.createTypeReferenceNode("any", ts.emptyArray);
-                case 303 /* JSDocOptionalType */:
+                case 307 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 302 /* JSDocNonNullableType */:
+                case 306 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 301 /* JSDocNullableType */:
+                case 305 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 305 /* JSDocVariadicType */:
+                case 309 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 304 /* JSDocFunctionType */:
+                case 308 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 172 /* TypeReference */:
+                case 173 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, ts.nullTransformationContext);
@@ -131916,7 +134855,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 305 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 309 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.factory.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.factory.createParameterDeclaration(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -131956,8 +134895,8 @@ var ts;
             var index = ts.factory.createParameterDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 143 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.factory.createTypeReferenceNode(node.typeArguments[0].kind === 143 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 144 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.factory.createTypeReferenceNode(node.typeArguments[0].kind === 144 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.factory.createTypeLiteralNode([ts.factory.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -132086,7 +135025,7 @@ var ts;
                         return members;
                     }
                     // 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 === 230 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 233 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentExpr) {
@@ -132142,7 +135081,7 @@ var ts;
                         var arrowFunctionBody = arrowFunction.body;
                         var bodyBlock;
                         // case 1: () => { return [1,2,3] }
-                        if (arrowFunctionBody.kind === 227 /* Block */) {
+                        if (arrowFunctionBody.kind === 230 /* Block */) {
                             bodyBlock = arrowFunctionBody;
                         }
                         // case 2: () => [1,2,3]
@@ -132337,7 +135276,7 @@ var ts;
                     // will eventually become
                     //   const response = await fetch('...')
                     // so we push an entry for 'response'.
-                    if (lastCallSignature && !ts.isFunctionLikeDeclaration(node.parent) && !synthNamesMap.has(symbolIdString)) {
+                    if (lastCallSignature && !ts.isParameter(node.parent) && !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.factory.createUniqueName("result", 16 /* Optimistic */);
                         var synthName = getNewNameIfConflict(ident, collidingSymbolMap);
@@ -132363,7 +135302,22 @@ var ts;
                     }
                 }
             });
-            return ts.getSynthesizedDeepCloneWithRenames(nodeToRename, /*includeTrivia*/ true, identsToRenameMap, checker);
+            return ts.getSynthesizedDeepCloneWithReplacements(nodeToRename, /*includeTrivia*/ true, function (original) {
+                if (ts.isBindingElement(original) && ts.isIdentifier(original.name) && ts.isObjectBindingPattern(original.parent)) {
+                    var symbol = checker.getSymbolAtLocation(original.name);
+                    var renameInfo = symbol && identsToRenameMap.get(String(ts.getSymbolId(symbol)));
+                    if (renameInfo && renameInfo.text !== (original.name || original.propertyName).getText()) {
+                        return ts.factory.createBindingElement(original.dotDotDotToken, original.propertyName || original.name, renameInfo, original.initializer);
+                    }
+                }
+                else if (ts.isIdentifier(original)) {
+                    var symbol = checker.getSymbolAtLocation(original);
+                    var renameInfo = symbol && identsToRenameMap.get(String(ts.getSymbolId(symbol)));
+                    if (renameInfo) {
+                        return ts.factory.createIdentifier(renameInfo.text);
+                    }
+                }
+            });
         }
         function getNewNameIfConflict(name, originalNames) {
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
@@ -132444,7 +135398,7 @@ var ts;
             }
             var tryStatement = ts.factory.createTryStatement(tryBlock, catchClause, /*finallyBlock*/ undefined);
             var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
-                && ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /*exclamationToken*/ undefined, /*type*/ undefined, varDeclIdentifier)], 2 /* Const */));
+                && ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.bindingPattern), /*exclamationToken*/ undefined, /*type*/ undefined, varDeclIdentifier)], 2 /* Const */));
             return ts.compact([varDeclList, tryStatement, destructuredResult]);
         }
         function createUniqueSynthName(prevArgName) {
@@ -132503,7 +135457,7 @@ var ts;
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             switch (func.kind) {
                 case 103 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
@@ -132529,22 +135483,24 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */: {
+                case 208 /* FunctionExpression */:
+                case 209 /* ArrowFunction */: {
                     var funcBody = func.body;
+                    var returnType_1 = (_c = getLastCallSignature(transformer.checker.getTypeAtLocation(func), transformer.checker)) === null || _c === void 0 ? void 0 : _c.getReturnType();
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
                         var refactoredStmts = [];
                         var seenReturnStatement = false;
-                        for (var _i = 0, _e = funcBody.statements; _i < _e.length; _i++) {
-                            var statement = _e[_i];
+                        for (var _i = 0, _f = funcBody.statements; _i < _f.length; _i++) {
+                            var statement = _f[_i];
                             if (ts.isReturnStatement(statement)) {
                                 seenReturnStatement = true;
                                 if (ts.isReturnStatementWithFixablePromiseHandler(statement)) {
                                     refactoredStmts = refactoredStmts.concat(getInnerTransformationBody(transformer, [statement], prevArgName));
                                 }
                                 else {
-                                    refactoredStmts.push.apply(refactoredStmts, maybeAnnotateAndReturn(statement.expression, (_c = parent.typeArguments) === null || _c === void 0 ? void 0 : _c[0]));
+                                    var possiblyAwaitedRightHandSide = returnType_1 && statement.expression ? getPossiblyAwaitedRightHandSide(transformer.checker, returnType_1, statement.expression) : statement.expression;
+                                    refactoredStmts.push.apply(refactoredStmts, maybeAnnotateAndReturn(possiblyAwaitedRightHandSide, (_d = parent.typeArguments) === null || _d === void 0 ? void 0 : _d[0]));
                                 }
                             }
                             else {
@@ -132561,19 +135517,21 @@ var ts;
                         if (innerCbBody.length > 0) {
                             return innerCbBody;
                         }
-                        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.factory.createAwaitExpression(rightHandSide) : rightHandSide;
-                        if (!shouldReturn(parent, transformer)) {
-                            var transformedStatement = createVariableOrAssignmentOrExpressionStatement(prevArgName, possiblyAwaitedRightHandSide, /*typeAnnotation*/ undefined);
-                            if (prevArgName) {
-                                prevArgName.types.push(returnType_1);
+                        if (returnType_1) {
+                            var possiblyAwaitedRightHandSide = getPossiblyAwaitedRightHandSide(transformer.checker, returnType_1, funcBody);
+                            if (!shouldReturn(parent, transformer)) {
+                                var transformedStatement = createVariableOrAssignmentOrExpressionStatement(prevArgName, possiblyAwaitedRightHandSide, /*typeAnnotation*/ undefined);
+                                if (prevArgName) {
+                                    prevArgName.types.push(returnType_1);
+                                }
+                                return transformedStatement;
+                            }
+                            else {
+                                return maybeAnnotateAndReturn(possiblyAwaitedRightHandSide, (_e = parent.typeArguments) === null || _e === void 0 ? void 0 : _e[0]);
                             }
-                            return transformedStatement;
                         }
                         else {
-                            return maybeAnnotateAndReturn(possiblyAwaitedRightHandSide, (_d = parent.typeArguments) === null || _d === void 0 ? void 0 : _d[0]);
+                            return silentFail();
                         }
                     }
                 }
@@ -132583,6 +135541,10 @@ var ts;
             }
             return ts.emptyArray;
         }
+        function getPossiblyAwaitedRightHandSide(checker, type, expr) {
+            var rightHandSide = ts.getSynthesizedDeepClone(expr);
+            return !!checker.getPromisedTypeOfPromise(type) ? ts.factory.createAwaitExpression(rightHandSide) : rightHandSide;
+        }
         function getLastCallSignature(type, checker) {
             var callSignatures = checker.getSignaturesOfType(type, 0 /* Call */);
             return ts.lastOrUndefined(callSignatures);
@@ -132738,10 +135700,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 257 /* ImportEqualsDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 200 /* CallExpression */:
+                    case 203 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.factory.createPropertyAccessExpression(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -132755,11 +135717,25 @@ var ts;
             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 useSitesToUnqualify;
+            // Process variable statements first to collect use sites that need to be updated inside other transformations
+            for (var _i = 0, _a = ts.filter(sourceFile.statements, ts.isVariableStatement); _i < _a.length; _i++) {
                 var statement = _a[_i];
-                var moduleExportsChanged = convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference);
+                var newUseSites = convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
+                if (newUseSites) {
+                    ts.copyEntries(newUseSites, useSitesToUnqualify !== null && useSitesToUnqualify !== void 0 ? useSitesToUnqualify : (useSitesToUnqualify = new ts.Map()));
+                }
+            }
+            // `convertStatement` will delete entries from `useSitesToUnqualify` when containing statements are replaced
+            for (var _b = 0, _c = ts.filter(sourceFile.statements, function (s) { return !ts.isVariableStatement(s); }); _b < _c.length; _b++) {
+                var statement = _c[_b];
+                var moduleExportsChanged = convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, useSitesToUnqualify, quotePreference);
                 moduleExportsChangedToDefault = moduleExportsChangedToDefault || moduleExportsChanged;
             }
+            // Remaining use sites can be changed directly
+            useSitesToUnqualify === null || useSitesToUnqualify === void 0 ? void 0 : useSitesToUnqualify.forEach(function (replacement, original) {
+                changes.replaceNode(sourceFile, original, replacement);
+            });
             return moduleExportsChangedToDefault;
         }
         function collectExportRenames(sourceFile, checker, identifiers) {
@@ -132792,24 +135768,24 @@ var ts;
                 node.forEachChild(recur);
             });
         }
-        function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
+        function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, useSitesToUnqualify, quotePreference) {
             switch (statement.kind) {
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 230 /* ExpressionStatement */: {
+                case 233 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 200 /* CallExpression */: {
+                        case 203 /* 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 213 /* BinaryExpression */: {
+                        case 216 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 62 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 62 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports, useSitesToUnqualify);
                         }
                     }
                 }
@@ -132821,17 +135797,17 @@ var ts;
         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 converted = ts.map(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 [];
+                        return convertedImports([]);
                     }
                     else if (ts.isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
                         foundImport = true;
-                        return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target, quotePreference);
+                        return convertSingleImport(name, initializer.arguments[0], checker, identifiers, target, quotePreference);
                     }
                     else if (ts.isPropertyAccessExpression(initializer) && ts.isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                         foundImport = true;
@@ -132839,33 +135815,40 @@ var ts;
                     }
                 }
                 // Move it out to its own variable statement. (This will not be used if `!foundImport`)
-                return ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([decl], declarationList.flags));
+                return convertedImports([ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([decl], declarationList.flags))]);
             });
             if (foundImport) {
                 // useNonAdjustedEndPosition to ensure we don't eat the newline after the statement.
-                changes.replaceNodeWithNodes(sourceFile, statement, newNodes);
+                changes.replaceNodeWithNodes(sourceFile, statement, ts.flatMap(converted, function (c) { return c.newImports; }));
+                var combinedUseSites_1;
+                ts.forEach(converted, function (c) {
+                    if (c.useSitesToUnqualify) {
+                        ts.copyEntries(c.useSitesToUnqualify, combinedUseSites_1 !== null && combinedUseSites_1 !== void 0 ? combinedUseSites_1 : (combinedUseSites_1 = new ts.Map()));
+                    }
+                });
+                return combinedUseSites_1;
             }
         }
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 193 /* ObjectBindingPattern */:
-                case 194 /* ArrayBindingPattern */: {
+                case 196 /* ObjectBindingPattern */:
+                case 197 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
-                    return [
+                    return convertedImports([
                         makeSingleImport(tmp, propertyName, moduleSpecifier, quotePreference),
                         makeConst(/*modifiers*/ undefined, name, ts.factory.createIdentifier(tmp)),
-                    ];
+                    ]);
                 }
                 case 78 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
-                    return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
+                    return convertedImports([makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]);
                 default:
                     return ts.Debug.assertNever(name, "Convert to ES6 module got invalid syntax form " + name.kind);
             }
         }
-        function convertAssignment(sourceFile, checker, assignment, changes, exports) {
+        function convertAssignment(sourceFile, checker, assignment, changes, exports, useSitesToUnqualify) {
             var left = assignment.left, right = assignment.right;
             if (!ts.isPropertyAccessExpression(left)) {
                 return false;
@@ -132876,7 +135859,7 @@ var ts;
                     changes.delete(sourceFile, assignment.parent);
                 }
                 else {
-                    var replacement = ts.isObjectLiteralExpression(right) ? tryChangeModuleExportsObject(right)
+                    var replacement = ts.isObjectLiteralExpression(right) ? tryChangeModuleExportsObject(right, useSitesToUnqualify)
                         : ts.isRequireCall(right, /*checkArgumentIsStringLiteralLike*/ true) ? convertReExportAll(right.arguments[0], checker)
                             : undefined;
                     if (replacement) {
@@ -132898,20 +135881,20 @@ var ts;
          * 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) {
+        function tryChangeModuleExportsObject(object, useSitesToUnqualify) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
                     // falls through
-                    case 286 /* ShorthandPropertyAssignment */:
-                    case 287 /* SpreadAssignment */:
+                    case 289 /* ShorthandPropertyAssignment */:
+                    case 290 /* SpreadAssignment */:
                         return undefined;
-                    case 285 /* PropertyAssignment */:
-                        return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 164 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.factory.createToken(92 /* ExportKeyword */)], prop);
+                    case 288 /* PropertyAssignment */:
+                        return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer, useSitesToUnqualify);
+                    case 165 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.factory.createToken(92 /* ExportKeyword */)], prop, useSitesToUnqualify);
                     default:
                         ts.Debug.assertNever(prop, "Convert to ES6 got invalid prop kind " + prop.kind);
                 }
@@ -132971,10 +135954,10 @@ var ts;
             }
         }
         // 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) {
+        function convertExportsDotXEquals_replaceNode(name, exported, useSitesToUnqualify) {
             var modifiers = [ts.factory.createToken(92 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 205 /* FunctionExpression */: {
+                case 208 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -132982,18 +135965,35 @@ var ts;
                     }
                 }
                 // falls through
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
-                    return functionExpressionToDeclaration(name, modifiers, exported);
-                case 218 /* ClassExpression */:
+                    return functionExpressionToDeclaration(name, modifiers, exported, useSitesToUnqualify);
+                case 221 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
-                    return classExpressionToDeclaration(name, modifiers, exported);
+                    return classExpressionToDeclaration(name, modifiers, exported, useSitesToUnqualify);
                 default:
                     return exportConst();
             }
             function exportConst() {
                 // `exports.x = 0;` --> `export const x = 0;`
-                return makeConst(modifiers, ts.factory.createIdentifier(name), exported); // TODO: GH#18217
+                return makeConst(modifiers, ts.factory.createIdentifier(name), replaceImportUseSites(exported, useSitesToUnqualify)); // TODO: GH#18217
+            }
+        }
+        function replaceImportUseSites(nodeOrNodes, useSitesToUnqualify) {
+            if (!useSitesToUnqualify || !ts.some(ts.arrayFrom(useSitesToUnqualify.keys()), function (original) { return ts.rangeContainsRange(nodeOrNodes, original); })) {
+                return nodeOrNodes;
+            }
+            return ts.isArray(nodeOrNodes)
+                ? ts.getSynthesizedDeepClonesWithReplacements(nodeOrNodes, /*includeTrivia*/ true, replaceNode)
+                : ts.getSynthesizedDeepCloneWithReplacements(nodeOrNodes, /*includeTrivia*/ true, replaceNode);
+            function replaceNode(original) {
+                // We are replacing `mod.SomeExport` wih `SomeExport`, so we only need to look at PropertyAccessExpressions
+                if (original.kind === 201 /* PropertyAccessExpression */) {
+                    var replacement = useSitesToUnqualify.get(original);
+                    // Remove entry from `useSitesToUnqualify` so the refactor knows it's taken care of by the parent statement we're replacing
+                    useSitesToUnqualify.delete(original);
+                    return replacement;
+                }
             }
         }
         /**
@@ -133001,9 +136001,9 @@ var ts;
          * 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) {
+        function convertSingleImport(name, moduleSpecifier, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 193 /* ObjectBindingPattern */: {
+                case 196 /* 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
@@ -133012,23 +136012,23 @@ var ts;
                             : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
                     });
                     if (importSpecifiers) {
-                        return [ts.makeImport(/*name*/ undefined, importSpecifiers, moduleSpecifier, quotePreference)];
+                        return convertedImports([ts.makeImport(/*name*/ undefined, importSpecifiers, moduleSpecifier, quotePreference)]);
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 194 /* ArrayBindingPattern */: {
+                case 197 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
                     */
                     var tmp = makeUniqueName(codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, target), identifiers);
-                    return [
+                    return convertedImports([
                         ts.makeImport(ts.factory.createIdentifier(tmp), /*namedImports*/ undefined, moduleSpecifier, quotePreference),
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.factory.createIdentifier(tmp)),
-                    ];
+                    ]);
                 }
                 case 78 /* Identifier */:
-                    return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
+                    return convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name, "Convert to ES6 module got invalid name kind " + name.kind);
             }
@@ -133037,12 +136037,13 @@ var ts;
          * 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) {
+        function convertSingleIdentifierImport(name, moduleSpecifier, 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 = new ts.Map();
             // True if there is some non-property use like `x()` or `f(x)`.
             var needDefaultImport = false;
+            var useSitesToUnqualify;
             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) {
@@ -133058,7 +136059,7 @@ var ts;
                         idName = makeUniqueName(propertyName, identifiers);
                         namedBindingsNames.set(propertyName, idName);
                     }
-                    changes.replaceNode(file, parent, ts.factory.createIdentifier(idName));
+                    (useSitesToUnqualify !== null && useSitesToUnqualify !== void 0 ? useSitesToUnqualify : (useSitesToUnqualify = new ts.Map())).set(parent, ts.factory.createIdentifier(idName));
                 }
                 else {
                     needDefaultImport = true;
@@ -133072,7 +136073,7 @@ var ts;
                 // If it was unused, ensure that we at least import *something*.
                 needDefaultImport = true;
             }
-            return [ts.makeImport(needDefaultImport ? ts.getSynthesizedDeepClone(name) : undefined, namedBindings, moduleSpecifier, quotePreference)];
+            return convertedImports([ts.makeImport(needDefaultImport ? ts.getSynthesizedDeepClone(name) : undefined, namedBindings, moduleSpecifier, quotePreference)], useSitesToUnqualify);
         }
         // Identifiers helpers
         function makeUniqueName(name, identifiers) {
@@ -133099,24 +136100,24 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 262 /* ImportSpecifier */:
+                case 265 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
             }
         }
         // Node helpers
-        function functionExpressionToDeclaration(name, additionalModifiers, fn) {
+        function functionExpressionToDeclaration(name, additionalModifiers, fn, useSitesToUnqualify) {
             return ts.factory.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.factory.converters.convertToFunctionBlock(ts.getSynthesizedDeepClone(fn.body)));
+            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.factory.converters.convertToFunctionBlock(replaceImportUseSites(fn.body, useSitesToUnqualify)));
         }
-        function classExpressionToDeclaration(name, additionalModifiers, cls) {
+        function classExpressionToDeclaration(name, additionalModifiers, cls, useSitesToUnqualify) {
             return ts.factory.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));
+            ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(cls.modifiers)), name, ts.getSynthesizedDeepClones(cls.typeParameters), ts.getSynthesizedDeepClones(cls.heritageClauses), replaceImportUseSites(cls.members, useSitesToUnqualify));
         }
         function makeSingleImport(localName, propertyName, moduleSpecifier, quotePreference) {
             return propertyName === "default"
@@ -133135,6 +136136,12 @@ var ts;
             /*modifiers*/ undefined, 
             /*isTypeOnly*/ false, exportSpecifiers && ts.factory.createNamedExports(exportSpecifiers), moduleSpecifier === undefined ? undefined : ts.factory.createStringLiteral(moduleSpecifier));
         }
+        function convertedImports(newImports, useSitesToUnqualify) {
+            return {
+                newImports: newImports,
+                useSitesToUnqualify: useSitesToUnqualify
+            };
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -133194,7 +136201,7 @@ var ts;
                 var fixedExportDeclarations = new ts.Map();
                 return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
                     var exportSpecifier = getExportSpecifierForDiagnosticSpan(diag, context.sourceFile);
-                    if (exportSpecifier && !ts.addToSeen(fixedExportDeclarations, ts.getNodeId(exportSpecifier.parent.parent))) {
+                    if (exportSpecifier && ts.addToSeen(fixedExportDeclarations, ts.getNodeId(exportSpecifier.parent.parent))) {
                         fixSingleExportDeclaration(changes, exportSpecifier, context);
                     }
                 });
@@ -133211,8 +136218,7 @@ var ts;
             var exportDeclaration = exportClause.parent;
             var typeExportSpecifiers = getTypeExportSpecifiers(exportSpecifier, context);
             if (typeExportSpecifiers.length === exportClause.elements.length) {
-                changes.replaceNode(context.sourceFile, exportDeclaration, ts.factory.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, 
-                /*isTypeOnly*/ true, exportClause, exportDeclaration.moduleSpecifier));
+                changes.insertModifierBefore(context.sourceFile, 149 /* TypeKeyword */, exportClause);
             }
             else {
                 var valueExportDeclaration = ts.factory.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, 
@@ -133221,7 +136227,10 @@ var ts;
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
                 /*isTypeOnly*/ true, ts.factory.createNamedExports(typeExportSpecifiers), exportDeclaration.moduleSpecifier);
-                changes.replaceNode(context.sourceFile, exportDeclaration, valueExportDeclaration);
+                changes.replaceNode(context.sourceFile, exportDeclaration, valueExportDeclaration, {
+                    leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
+                    trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Exclude
+                });
                 changes.insertNodeAfter(context.sourceFile, exportDeclaration, typeExportDeclaration);
             }
         }
@@ -133288,6 +136297,53 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "convertLiteralTypeToMappedType";
+        var errorCodes = [ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0.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 name = info.name, constraint = info.constraint;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, info); });
+                return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Convert_0_to_1_in_0, constraint, name], fixId, ts.Diagnostics.Convert_all_type_literals_to_mapped_type)];
+            },
+            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);
+            if (ts.isIdentifier(token)) {
+                var propertySignature = ts.cast(token.parent.parent, ts.isPropertySignature);
+                var propertyName = token.getText(sourceFile);
+                return {
+                    container: ts.cast(propertySignature.parent, ts.isTypeLiteralNode),
+                    typeNode: propertySignature.type,
+                    constraint: propertyName,
+                    name: propertyName === "K" ? "P" : "K",
+                };
+            }
+            return undefined;
+        }
+        function doChange(changes, sourceFile, _a) {
+            var container = _a.container, typeNode = _a.typeNode, constraint = _a.constraint, name = _a.name;
+            changes.replaceNode(sourceFile, container, ts.factory.createMappedTypeNode(/*readonlyToken*/ undefined, ts.factory.createTypeParameterDeclaration(name, ts.factory.createTypeReferenceNode(constraint)), /*nameType*/ undefined, /*questionToken*/ undefined, typeNode));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -133432,7 +136488,7 @@ var ts;
                 var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker));
                 var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, host, program, useAutoImportProvider);
                 var preferTypeOnlyImport = !!usageIsTypeOnly && compilerOptions.importsNotUsedAsValues === 2 /* Error */;
-                var useRequire = shouldUseRequire(sourceFile, compilerOptions);
+                var useRequire = shouldUseRequire(sourceFile, program);
                 var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, /*position*/ undefined, preferTypeOnlyImport, useRequire, host, preferences);
                 addImport({ fixes: [fix], symbolName: symbolName });
             }
@@ -133535,7 +136591,7 @@ var ts;
         function getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, symbolName, host, program, formatContext, position, preferences) {
             var compilerOptions = program.getCompilerOptions();
             var exportInfos = getAllReExportingModules(sourceFile, exportedSymbol, moduleSymbol, symbolName, host, program, /*useAutoImportProvider*/ true);
-            var useRequire = shouldUseRequire(sourceFile, compilerOptions);
+            var useRequire = shouldUseRequire(sourceFile, program);
             var preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === 2 /* Error */ && !ts.isSourceFileJS(sourceFile) && ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
             var moduleSpecifier = ts.first(getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, exportInfos, host, preferences)).moduleSpecifier;
             var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, preferTypeOnlyImport, useRequire, host, preferences);
@@ -133561,7 +136617,7 @@ var ts;
                     return;
                 }
                 var defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions);
-                if (defaultInfo && defaultInfo.name === symbolName && ts.skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
+                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === 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.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -133617,11 +136673,11 @@ var ts;
         function getTargetModuleFromNamespaceLikeImport(declaration, checker) {
             var _a;
             switch (declaration.kind) {
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return checker.resolveExternalModuleName(declaration.initializer.arguments[0]);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return checker.getAliasedSymbol(declaration.symbol);
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     var namespaceImport = ts.tryCast((_a = declaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings, ts.isNamespaceImport);
                     return namespaceImport && checker.getAliasedSymbol(namespaceImport.symbol);
                 default:
@@ -133631,11 +136687,11 @@ var ts;
         function getNamespaceLikeImportText(declaration) {
             var _a, _b, _c;
             switch (declaration.kind) {
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return (_a = ts.tryCast(declaration.name, ts.isIdentifier)) === null || _a === void 0 ? void 0 : _a.text;
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return declaration.name.text;
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return (_c = ts.tryCast((_b = declaration.importClause) === null || _b === void 0 ? void 0 : _b.namedBindings, ts.isNamespaceImport)) === null || _c === void 0 ? void 0 : _c.name.text;
                 default:
                     return ts.Debug.assertNever(declaration);
@@ -133644,10 +136700,10 @@ var ts;
         function tryAddToExistingImport(existingImports, canUseTypeOnlyImport) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind === 257 /* ImportEqualsDeclaration */)
+                if (declaration.kind === 260 /* ImportEqualsDeclaration */)
                     return undefined;
-                if (declaration.kind === 246 /* VariableDeclaration */) {
-                    return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 193 /* ObjectBindingPattern */
+                if (declaration.kind === 249 /* VariableDeclaration */) {
+                    return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 196 /* ObjectBindingPattern */
                         ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind: importKind, moduleSpecifier: declaration.initializer.arguments[0].text, canUseTypeOnlyImport: false }
                         : undefined;
                 }
@@ -133655,7 +136711,7 @@ var ts;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 261 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 264 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: importClause, importKind: importKind, moduleSpecifier: declaration.moduleSpecifier.getText(), canUseTypeOnlyImport: canUseTypeOnlyImport }
                     : undefined;
             });
@@ -133668,15 +136724,38 @@ var ts;
                 if (ts.isRequireVariableDeclaration(i.parent, /*requireStringLiteralLikeArgument*/ true)) {
                     return checker.resolveExternalModuleName(moduleSpecifier) === moduleSymbol ? { declaration: i.parent, importKind: importKind } : undefined;
                 }
-                if (i.kind === 258 /* ImportDeclaration */ || i.kind === 257 /* ImportEqualsDeclaration */) {
+                if (i.kind === 261 /* ImportDeclaration */ || i.kind === 260 /* ImportEqualsDeclaration */) {
                     return checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
                 }
             });
         }
-        function shouldUseRequire(sourceFile, compilerOptions) {
-            return ts.isSourceFileJS(sourceFile)
-                && !sourceFile.externalModuleIndicator
-                && (!!sourceFile.commonJsModuleIndicator || ts.getEmitModuleKind(compilerOptions) < ts.ModuleKind.ES2015);
+        function shouldUseRequire(sourceFile, program) {
+            // 1. TypeScript files don't use require variable declarations
+            if (!ts.isSourceFileJS(sourceFile)) {
+                return false;
+            }
+            // 2. If the current source file is unambiguously CJS or ESM, go with that
+            if (sourceFile.commonJsModuleIndicator && !sourceFile.externalModuleIndicator)
+                return true;
+            if (sourceFile.externalModuleIndicator && !sourceFile.commonJsModuleIndicator)
+                return false;
+            // 3. If there's a tsconfig/jsconfig, use its module setting
+            var compilerOptions = program.getCompilerOptions();
+            if (compilerOptions.configFile) {
+                return ts.getEmitModuleKind(compilerOptions) < ts.ModuleKind.ES2015;
+            }
+            // 4. Match the first other JS file in the program that's unambiguously CJS or ESM
+            for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
+                var otherFile = _a[_i];
+                if (otherFile === sourceFile || !ts.isSourceFileJS(otherFile) || program.isSourceFileFromExternalLibrary(otherFile))
+                    continue;
+                if (otherFile.commonJsModuleIndicator && !otherFile.externalModuleIndicator)
+                    return true;
+                if (otherFile.externalModuleIndicator && !otherFile.commonJsModuleIndicator)
+                    return false;
+            }
+            // 5. Literally nothing to go on
+            return true;
         }
         function getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, moduleSymbols, host, preferences) {
             var isJs = ts.isSourceFileJS(sourceFile);
@@ -133711,9 +136790,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a, preferTypeOnlyImport, useRequire) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var moduleSpecifier = declaration.kind === 258 /* ImportDeclaration */ ? declaration.moduleSpecifier :
-                declaration.kind === 246 /* VariableDeclaration */ ? declaration.initializer.arguments[0] :
-                    declaration.moduleReference.kind === 269 /* ExternalModuleReference */ ? declaration.moduleReference.expression :
+            var moduleSpecifier = declaration.kind === 261 /* ImportDeclaration */ ? declaration.moduleSpecifier :
+                declaration.kind === 249 /* VariableDeclaration */ ? declaration.initializer.arguments[0] :
+                    declaration.moduleReference.kind === 272 /* ExternalModuleReference */ ? declaration.moduleReference.expression :
                         undefined;
             return moduleSpecifier && ts.isStringLiteral(moduleSpecifier)
                 ? { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier.text, importKind: importKind, typeOnly: preferTypeOnlyImport, useRequire: useRequire }
@@ -133735,7 +136814,7 @@ var ts;
             var symbol = checker.getAliasedSymbol(umdSymbol);
             var symbolName = umdSymbol.name;
             var exportInfos = [{ moduleSymbol: symbol, importKind: getUmdImportKind(sourceFile, program.getCompilerOptions()), exportedSymbolIsTypeOnly: false }];
-            var useRequire = shouldUseRequire(sourceFile, program.getCompilerOptions());
+            var useRequire = shouldUseRequire(sourceFile, program);
             var fixes = getFixForImport(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*preferTypeOnlyImport*/ false, useRequire, program, sourceFile, host, preferences);
             return { fixes: fixes, symbolName: symbolName };
         }
@@ -133784,8 +136863,8 @@ var ts;
             ts.Debug.assert(symbolName !== "default" /* Default */, "'default' isn't a legal identifier and couldn't occur here");
             var compilerOptions = program.getCompilerOptions();
             var preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === 2 /* Error */ && ts.isValidTypeOnlyAliasUseSite(symbolToken);
-            var useRequire = shouldUseRequire(sourceFile, compilerOptions);
-            var exportInfos = getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, useAutoImportProvider, host);
+            var useRequire = shouldUseRequire(sourceFile, program);
+            var exportInfos = getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host);
             var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfos.entries(), function (_a) {
                 var _ = _a[0], exportInfos = _a[1];
                 return getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences);
@@ -133803,23 +136882,25 @@ var ts;
             return symbolToken.text;
         }
         // 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, useAutoImportProvider, host) {
+        function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, sourceFile, program, useAutoImportProvider, host) {
             // 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) {
+            function addSymbol(moduleSymbol, exportedSymbol, importKind, checker) {
                 originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
             }
-            forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, function (moduleSymbol) {
+            forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, function (moduleSymbol, _, program) {
+                var checker = program.getTypeChecker();
                 cancellationToken.throwIfCancellationRequested();
-                var defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
-                if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
-                    addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind);
+                var compilerOptions = program.getCompilerOptions();
+                var defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, compilerOptions);
+                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === symbolName) && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
+                    addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind, checker);
                 }
                 // check exports with the same name
                 var exportSymbolWithIdenticalName = checker.tryGetMemberInModuleExportsAndProperties(symbolName, moduleSymbol);
                 if (exportSymbolWithIdenticalName && symbolHasMeaning(exportSymbolWithIdenticalName, currentTokenMeaning)) {
-                    addSymbol(moduleSymbol, exportSymbolWithIdenticalName, 0 /* Named */);
+                    addSymbol(moduleSymbol, exportSymbolWithIdenticalName, 0 /* Named */, checker);
                 }
             });
             return originalSymbolToExportInfos;
@@ -133873,7 +136954,13 @@ var ts;
                 return { symbolForMeaning: defaultExport, name: name };
             if (defaultExport.flags & 2097152 /* Alias */) {
                 var aliased = checker.getImmediateAliasedSymbol(defaultExport);
-                return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.checkDefined(aliased.parent, "Alias targets of default exports must have a parent"), checker, compilerOptions);
+                if (aliased && aliased.parent) {
+                    // - `aliased` will be undefined if the module is exporting an unresolvable name,
+                    //    but we can still offer completions for it.
+                    // - `aliased.parent` will be undefined if the module is exporting `globalThis.something`,
+                    //    or another expression that resolves to a global.
+                    return getDefaultExportInfoWorker(aliased, aliased.parent, checker, compilerOptions);
+                }
             }
             if (defaultExport.escapedName !== "default" /* Default */ &&
                 defaultExport.escapedName !== "export=" /* ExportEquals */) {
@@ -133929,7 +137016,7 @@ var ts;
             }
         }
         function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, canUseTypeOnlyImport) {
-            if (clause.kind === 193 /* ObjectBindingPattern */) {
+            if (clause.kind === 196 /* ObjectBindingPattern */) {
                 if (defaultImport) {
                     addElementToBindingPattern(clause, defaultImport, "default");
                 }
@@ -133963,7 +137050,7 @@ var ts;
                 else if (existingSpecifiers === null || existingSpecifiers === void 0 ? void 0 : existingSpecifiers.length) {
                     for (var _b = 0, newSpecifiers_2 = newSpecifiers; _b < newSpecifiers_2.length; _b++) {
                         var spec = newSpecifiers_2[_b];
-                        changes.insertNodeAtEndOfList(sourceFile, existingSpecifiers, spec);
+                        changes.insertNodeInListAfter(sourceFile, ts.last(existingSpecifiers), spec, existingSpecifiers);
                     }
                 }
                 else {
@@ -134336,7 +137423,7 @@ var ts;
         });
         function getNamedTupleMember(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            return ts.findAncestor(token, function (t) { return t.kind === 191 /* NamedTupleMember */; });
+            return ts.findAncestor(token, function (t) { return t.kind === 192 /* NamedTupleMember */; });
         }
         function doChange(changes, sourceFile, namedTupleMember) {
             if (!namedTupleMember) {
@@ -134345,11 +137432,11 @@ var ts;
             var unwrappedType = namedTupleMember.type;
             var sawOptional = false;
             var sawRest = false;
-            while (unwrappedType.kind === 179 /* OptionalType */ || unwrappedType.kind === 180 /* RestType */ || unwrappedType.kind === 185 /* ParenthesizedType */) {
-                if (unwrappedType.kind === 179 /* OptionalType */) {
+            while (unwrappedType.kind === 180 /* OptionalType */ || unwrappedType.kind === 181 /* RestType */ || unwrappedType.kind === 186 /* ParenthesizedType */) {
+                if (unwrappedType.kind === 180 /* OptionalType */) {
                     sawOptional = true;
                 }
-                else if (unwrappedType.kind === 180 /* RestType */) {
+                else if (unwrappedType.kind === 181 /* RestType */) {
                     sawRest = true;
                 }
                 unwrappedType = unwrappedType.type;
@@ -134373,7 +137460,7 @@ var ts;
             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,
+            ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2.code,
             // for JSX class components
             ts.Diagnostics.No_overload_matches_this_call.code,
             // for JSX FC
@@ -134420,6 +137507,12 @@ var ts;
                 }
                 suggestedSymbol = checker.getSuggestedSymbolForNonexistentProperty(node, containingType);
             }
+            else if (ts.isQualifiedName(parent) && parent.right === node) {
+                var symbol = checker.getSymbolAtLocation(parent.left);
+                if (symbol && symbol.flags & 1536 /* Module */) {
+                    suggestedSymbol = checker.getSuggestedSymbolForNonexistentModule(parent.right, symbol);
+                }
+            }
             else if (ts.isImportSpecifier(parent) && parent.name === node) {
                 ts.Debug.assertNode(node, ts.isIdentifier, "Expected an identifier for spelling (import)");
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
@@ -134643,19 +137736,19 @@ var ts;
         }
         function getVariableLikeInitializer(declaration) {
             switch (declaration.kind) {
-                case 246 /* VariableDeclaration */:
-                case 159 /* Parameter */:
-                case 195 /* BindingElement */:
-                case 162 /* PropertyDeclaration */:
-                case 285 /* PropertyAssignment */:
+                case 249 /* VariableDeclaration */:
+                case 160 /* Parameter */:
+                case 198 /* BindingElement */:
+                case 163 /* PropertyDeclaration */:
+                case 288 /* PropertyAssignment */:
                     return declaration.initializer;
-                case 277 /* JsxAttribute */:
+                case 280 /* JsxAttribute */:
                     return declaration.initializer && (ts.isJsxExpression(declaration.initializer) ? declaration.initializer.expression : undefined);
-                case 286 /* ShorthandPropertyAssignment */:
-                case 161 /* PropertySignature */:
-                case 288 /* EnumMember */:
-                case 328 /* JSDocPropertyTag */:
-                case 322 /* JSDocParameterTag */:
+                case 289 /* ShorthandPropertyAssignment */:
+                case 162 /* PropertySignature */:
+                case 291 /* EnumMember */:
+                case 333 /* JSDocPropertyTag */:
+                case 326 /* JSDocParameterTag */:
                     return undefined;
             }
         }
@@ -134841,7 +137934,7 @@ var ts;
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, token, makeStatic) {
             var tokenName = token.text;
             if (makeStatic) {
-                if (classDeclaration.kind === 218 /* ClassExpression */) {
+                if (classDeclaration.kind === 221 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -134893,7 +137986,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 213 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 216 /* 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)));
@@ -134932,7 +138025,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.factory.createKeywordTypeNode(146 /* StringKeyword */);
+            var stringTypeNode = ts.factory.createKeywordTypeNode(147 /* StringKeyword */);
             var indexingParameter = ts.factory.createParameterDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -134983,7 +138076,7 @@ var ts;
              */
             var hasStringInitializer = ts.some(enumDeclaration.members, function (member) {
                 var type = checker.getTypeAtLocation(member);
-                return !!(type && type.flags & 132 /* StringLike */);
+                return !!(type && type.flags & 402653316 /* StringLike */);
             });
             var enumMember = ts.factory.createEnumMember(token, hasStringInitializer ? ts.factory.createStringLiteral(token.text) : undefined);
             changes.replaceNode(enumDeclaration.getSourceFile(), enumDeclaration, ts.factory.updateEnumDeclaration(enumDeclaration, enumDeclaration.decorators, enumDeclaration.modifiers, enumDeclaration.name, ts.concatenate(enumDeclaration.members, ts.singleElementArray(enumMember))), {
@@ -135507,7 +138600,7 @@ var ts;
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(character, preferences) + "}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(sourceFile, preferences, character) + "}";
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -135649,7 +138742,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.factory.createKeywordTypeNode(152 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -135665,7 +138758,7 @@ var ts;
             return ts.isVariableDeclarationList(token.parent) && ts.first(token.parent.getChildren(sourceFile)) === token;
         }
         function deleteEntireVariableStatement(changes, sourceFile, node) {
-            changes.delete(sourceFile, node.parent.kind === 229 /* VariableStatement */ ? node.parent : node);
+            changes.delete(sourceFile, node.parent.kind === 232 /* VariableStatement */ ? node.parent : node);
         }
         function deleteDestructuringElements(changes, sourceFile, node) {
             ts.forEach(node.elements, function (n) { return changes.delete(sourceFile, n); });
@@ -135690,14 +138783,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 159 /* Parameter */:
-                case 158 /* TypeParameter */:
+                case 160 /* Parameter */:
+                case 159 /* TypeParameter */:
                     return true;
-                case 246 /* VariableDeclaration */: {
+                case 249 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 236 /* ForOfStatement */:
-                        case 235 /* ForInStatement */:
+                        case 239 /* ForOfStatement */:
+                        case 238 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -135729,12 +138822,10 @@ var ts;
         }
         function tryDeleteParameter(changes, sourceFile, p, checker, sourceFiles, isFixAll) {
             if (isFixAll === void 0) { isFixAll = false; }
-            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);
-                    });
+            if (mayDeleteParameter(checker, sourceFile, p, 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) { return changes.deleteModifier(sourceFile, modifier); });
                 }
                 else {
                     changes.delete(sourceFile, p);
@@ -135742,29 +138833,28 @@ var ts;
                 }
             }
         }
-        function mayDeleteParameter(p, checker, isFixAll) {
-            var parent = p.parent;
+        function mayDeleteParameter(checker, sourceFile, parameter, isFixAll) {
+            var parent = parameter.parent;
             switch (parent.kind) {
-                case 164 /* MethodDeclaration */:
+                case 165 /* 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 165 /* Constructor */:
-                case 248 /* FunctionDeclaration */:
+                case 166 /* Constructor */:
+                    return true;
+                case 251 /* FunctionDeclaration */: {
+                    if (parent.name && isCallbackLike(checker, sourceFile, parent.name)) {
+                        return isLastParameter(parent, parameter, isFixAll);
+                    }
                     return true;
-                case 205 /* FunctionExpression */:
-                case 206 /* ArrowFunction */: {
+                }
+                case 208 /* FunctionExpression */:
+                case 209 /* 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, "The parameter should already be in the list");
-                    return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 78 /* Identifier */ && !p.symbol.isReferenced; })
-                        : index === parameters.length - 1;
-                }
-                case 167 /* SetAccessor */:
+                    return isLastParameter(parent, parameter, isFixAll);
+                case 168 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -135779,6 +138869,19 @@ var ts;
                 }
             });
         }
+        function isCallbackLike(checker, sourceFile, name) {
+            return !!ts.FindAllReferences.Core.eachSymbolReferenceInFile(name, checker, sourceFile, function (reference) {
+                return ts.isIdentifier(reference) && ts.isCallExpression(reference.parent) && reference.parent.arguments.indexOf(reference) >= 0;
+            });
+        }
+        function isLastParameter(func, parameter, isFixAll) {
+            var parameters = func.parameters;
+            var index = parameters.indexOf(parameter);
+            ts.Debug.assert(index !== -1, "The parameter should already be in the list");
+            return isFixAll ?
+                parameters.slice(index + 1).every(function (p) { return ts.isIdentifier(p.name) && !p.symbol.isReferenced; }) :
+                index === parameters.length - 1;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -135813,7 +138916,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 231 /* IfStatement */:
+                    case 234 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -135824,8 +138927,8 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 233 /* WhileStatement */:
-                    case 234 /* ForStatement */:
+                    case 236 /* WhileStatement */:
+                    case 237 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
@@ -135898,7 +139001,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 === 301 /* JSDocNullableType */) {
+                if (typeNode.kind === 305 /* 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));
@@ -135918,7 +139021,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 301 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 305 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -135935,22 +139038,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 221 /* AsExpression */:
-                case 168 /* CallSignature */:
-                case 169 /* ConstructSignature */:
-                case 248 /* FunctionDeclaration */:
-                case 166 /* GetAccessor */:
-                case 170 /* IndexSignature */:
-                case 189 /* MappedType */:
-                case 164 /* MethodDeclaration */:
-                case 163 /* MethodSignature */:
-                case 159 /* Parameter */:
-                case 162 /* PropertyDeclaration */:
-                case 161 /* PropertySignature */:
-                case 167 /* SetAccessor */:
-                case 251 /* TypeAliasDeclaration */:
-                case 203 /* TypeAssertionExpression */:
-                case 246 /* VariableDeclaration */:
+                case 224 /* AsExpression */:
+                case 169 /* CallSignature */:
+                case 170 /* ConstructSignature */:
+                case 251 /* FunctionDeclaration */:
+                case 167 /* GetAccessor */:
+                case 171 /* IndexSignature */:
+                case 190 /* MappedType */:
+                case 165 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 160 /* Parameter */:
+                case 163 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 168 /* SetAccessor */:
+                case 254 /* TypeAliasDeclaration */:
+                case 206 /* TypeAssertionExpression */:
+                case 249 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -136052,14 +139155,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 164 /* MethodDeclaration */:
+                case 165 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 248 /* FunctionDeclaration */:
-                case 205 /* FunctionExpression */:
+                case 251 /* FunctionDeclaration */:
+                case 208 /* FunctionExpression */:
                     insertBefore = ts.findChildOfKind(containingFunction, 97 /* FunctionKeyword */, sourceFile);
                     break;
-                case 206 /* ArrowFunction */:
+                case 209 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -136138,7 +139241,7 @@ var ts;
             else {
                 ts.Debug.fail("fixPropertyOverrideAccessor codefix got unexpected error code " + code);
             }
-            return codefix.generateAccessorFromProperty(file, startPosition, endPosition, context, ts.Diagnostics.Generate_get_and_set_accessors.message);
+            return codefix.generateAccessorFromProperty(file, context.program, startPosition, endPosition, context, ts.Diagnostics.Generate_get_and_set_accessors.message);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -136392,7 +139495,7 @@ var ts;
         function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 161 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 162 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -136441,14 +139544,14 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.factory.createJSDocComment(comments.join("\n"), ts.factory.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
-            var jsDocNode = parent.kind === 206 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 209 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         codefix.addJSDocTags = addJSDocTags;
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 162 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 163 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -136458,14 +139561,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 322 /* JSDocParameterTag */: {
+                case 326 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment)
                         : undefined;
                 }
-                case 323 /* JSDocReturnTag */:
+                case 327 /* JSDocReturnTag */:
                     return ts.factory.createJSDocReturnTag(/*tagName*/ undefined, newTag.typeExpression, oldTag.comment);
             }
         }
@@ -136490,18 +139593,18 @@ var ts;
         function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 165 /* Constructor */:
+                case 166 /* Constructor */:
                     searchToken = ts.findChildOfKind(containingFunction, 132 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 206 /* ArrowFunction */:
-                case 205 /* FunctionExpression */:
+                case 209 /* ArrowFunction */:
+                case 208 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 248 /* FunctionDeclaration */:
-                case 164 /* MethodDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 165 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
@@ -136643,24 +139746,24 @@ var ts;
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 230 /* ExpressionStatement */:
+                    case 233 /* ExpressionStatement */:
                         inferTypeFromExpressionStatement(node, usage);
                         break;
-                    case 212 /* PostfixUnaryExpression */:
+                    case 215 /* PostfixUnaryExpression */:
                         usage.isNumber = true;
                         break;
-                    case 211 /* PrefixUnaryExpression */:
+                    case 214 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpression(node.parent, usage);
                         break;
-                    case 213 /* BinaryExpression */:
+                    case 216 /* BinaryExpression */:
                         inferTypeFromBinaryExpression(node, node.parent, usage);
                         break;
-                    case 281 /* CaseClause */:
-                    case 282 /* DefaultClause */:
+                    case 284 /* CaseClause */:
+                    case 285 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabel(node.parent, usage);
                         break;
-                    case 200 /* CallExpression */:
-                    case 201 /* NewExpression */:
+                    case 203 /* CallExpression */:
+                    case 204 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpression(node.parent, usage);
                         }
@@ -136668,20 +139771,20 @@ var ts;
                             inferTypeFromContextualType(node, usage);
                         }
                         break;
-                    case 198 /* PropertyAccessExpression */:
+                    case 201 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpression(node.parent, usage);
                         break;
-                    case 199 /* ElementAccessExpression */:
+                    case 202 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpression(node.parent, node, usage);
                         break;
-                    case 285 /* PropertyAssignment */:
-                    case 286 /* ShorthandPropertyAssignment */:
+                    case 288 /* PropertyAssignment */:
+                    case 289 /* ShorthandPropertyAssignment */:
                         inferTypeFromPropertyAssignment(node.parent, usage);
                         break;
-                    case 162 /* PropertyDeclaration */:
+                    case 163 /* PropertyDeclaration */:
                         inferTypeFromPropertyDeclaration(node.parent, usage);
                         break;
-                    case 246 /* VariableDeclaration */: {
+                    case 249 /* 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.
@@ -136776,7 +139879,7 @@ var ts;
                         else if (otherOperandType.flags & 296 /* NumberLike */) {
                             usage.isNumber = true;
                         }
-                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                        else if (otherOperandType.flags & 402653316 /* StringLike */) {
                             usage.isString = true;
                         }
                         else if (otherOperandType.flags & 1 /* Any */) {
@@ -136803,7 +139906,7 @@ var ts;
                     case 56 /* BarBarToken */:
                     case 60 /* QuestionQuestionToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 246 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 249 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usage, checker.getTypeAtLocation(parent.right));
@@ -136831,7 +139934,7 @@ var ts;
                     }
                 }
                 calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 200 /* CallExpression */) {
+                if (parent.kind === 203 /* CallExpression */) {
                     (usage.calls || (usage.calls = [])).push(call);
                 }
                 else {
@@ -137274,8 +140377,8 @@ var ts;
             var ambient = !!(enclosingDeclaration.flags & 8388608 /* Ambient */);
             var quotePreference = ts.getQuotePreference(sourceFile, preferences);
             switch (declaration.kind) {
-                case 161 /* PropertySignature */:
-                case 162 /* PropertyDeclaration */:
+                case 162 /* PropertySignature */:
+                case 163 /* PropertyDeclaration */:
                     var flags = quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : undefined;
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
                     if (importAdder) {
@@ -137289,8 +140392,8 @@ var ts;
                     /*decorators*/ undefined, modifiers, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 166 /* GetAccessor */:
-                case 167 /* SetAccessor */: {
+                case 167 /* GetAccessor */:
+                case 168 /* SetAccessor */: {
                     var typeNode_1 = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     var allAccessors = ts.getAllAccessorDeclarations(declarations, declaration);
                     var orderedAccessors = allAccessors.secondAccessor
@@ -137319,8 +140422,8 @@ var ts;
                     }
                     break;
                 }
-                case 163 /* MethodSignature */:
-                case 164 /* MethodDeclaration */:
+                case 164 /* MethodSignature */:
+                case 165 /* 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
@@ -137366,7 +140469,7 @@ var ts;
             var checker = program.getTypeChecker();
             var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions());
             var flags = 1 /* NoTruncation */ | 1073741824 /* NoUndefinedOptionalParameterType */ | 256 /* SuppressAnyReturnType */ | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0);
-            var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, 164 /* MethodDeclaration */, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, 165 /* MethodDeclaration */, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -137615,8 +140718,8 @@ var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
-        function generateAccessorFromProperty(file, start, end, context, _actionName) {
-            var fieldInfo = getAccessorConvertiblePropertyAtPosition(file, start, end);
+        function generateAccessorFromProperty(file, program, start, end, context, _actionName) {
+            var fieldInfo = getAccessorConvertiblePropertyAtPosition(file, program, start, end);
             if (!fieldInfo || !fieldInfo.info)
                 return undefined;
             var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
@@ -137639,7 +140742,7 @@ var ts;
                     fieldModifiers = createModifiers(prepareModifierFlagsForField(modifierFlags));
                 }
             }
-            updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
+            updateFieldDeclaration(changeTracker, file, declaration, type, fieldName, fieldModifiers);
             var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
             ts.suppressLeadingAndTrailingTrivia(getAccessor);
             insertAccessor(changeTracker, file, getAccessor, declaration, container);
@@ -137688,7 +140791,7 @@ var ts;
             modifierFlags |= 8 /* Private */;
             return modifierFlags;
         }
-        function getAccessorConvertiblePropertyAtPosition(file, start, end, considerEmptySpans) {
+        function getAccessorConvertiblePropertyAtPosition(file, program, start, end, considerEmptySpans) {
             if (considerEmptySpans === void 0) { considerEmptySpans = true; }
             var node = ts.getTokenAtPosition(file, start);
             var cursorRequest = start === end && considerEmptySpans;
@@ -137718,8 +140821,8 @@ var ts;
                 info: {
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasEffectiveReadonlyModifier(declaration),
-                    type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 159 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    type: getDeclarationType(declaration, program),
+                    container: declaration.kind === 160 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -137747,17 +140850,17 @@ var ts;
                 ts.factory.createExpressionStatement(ts.factory.createAssignment(createAccessorAccessExpression(fieldName, isStatic, container), ts.factory.createIdentifier("value")))
             ], /*multiLine*/ true));
         }
-        function updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers) {
-            var property = ts.factory.updatePropertyDeclaration(declaration, declaration.decorators, modifiers, fieldName, declaration.questionToken || declaration.exclamationToken, declaration.type, declaration.initializer);
+        function updatePropertyDeclaration(changeTracker, file, declaration, type, fieldName, modifiers) {
+            var property = ts.factory.updatePropertyDeclaration(declaration, declaration.decorators, modifiers, fieldName, declaration.questionToken || declaration.exclamationToken, type, declaration.initializer);
             changeTracker.replaceNode(file, declaration, property);
         }
         function updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName) {
             var assignment = ts.factory.updatePropertyAssignment(declaration, fieldName, declaration.initializer);
             changeTracker.replacePropertyAssignment(file, declaration, assignment);
         }
-        function updateFieldDeclaration(changeTracker, file, declaration, fieldName, modifiers) {
+        function updateFieldDeclaration(changeTracker, file, declaration, type, fieldName, modifiers) {
             if (ts.isPropertyDeclaration(declaration)) {
-                updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers);
+                updatePropertyDeclaration(changeTracker, file, declaration, type, fieldName, modifiers);
             }
             else if (ts.isPropertyAssignment(declaration)) {
                 updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName);
@@ -137790,6 +140893,18 @@ var ts;
                 }
             });
         }
+        function getDeclarationType(declaration, program) {
+            var typeNode = ts.getTypeAnnotationNode(declaration);
+            if (ts.isPropertyDeclaration(declaration) && typeNode && declaration.questionToken) {
+                var typeChecker = program.getTypeChecker();
+                var type = typeChecker.getTypeFromTypeNode(typeNode);
+                if (!typeChecker.isTypeAssignableTo(typeChecker.getUndefinedType(), type)) {
+                    var types = ts.isUnionTypeNode(typeNode) ? typeNode.types : [typeNode];
+                    return ts.factory.createUnionTypeNode(__spreadArrays(types, [ts.factory.createKeywordTypeNode(150 /* UndefinedKeyword */)]));
+                }
+            }
+            return typeNode;
+        }
         function getAllSupers(decl, checker) {
             var res = [];
             while (decl) {
@@ -137843,7 +140958,7 @@ var ts;
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 200 /* CallExpression */ : 201 /* NewExpression */;
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 203 /* CallExpression */ : 204 /* NewExpression */;
             var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
@@ -137962,7 +141077,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.factory.createKeywordTypeNode(149 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.factory.createKeywordTypeNode(150 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.factory.createUnionTypeNode(types));
@@ -138177,7 +141292,7 @@ var ts;
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             ts.Debug.assert(token.kind === 99 /* ImportKeyword */, "This token should be an ImportKeyword");
-            ts.Debug.assert(token.parent.kind === 192 /* ImportType */, "Token parent should be an ImportType");
+            ts.Debug.assert(token.parent.kind === 195 /* ImportType */, "Token parent should be an ImportType");
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -138309,7 +141424,8 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.factory.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.factory.createMappedTypeNode(ts.hasEffectiveReadonlyModifier(indexSignature) ? ts.factory.createModifier(141 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.factory.createMappedTypeNode(ts.hasEffectiveReadonlyModifier(indexSignature) ? ts.factory.createModifier(142 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, 
+            /*nameType*/ undefined, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.factory.createIntersectionTypeNode(__spreadArrays(ts.getAllSuperTypeNodes(container), [
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.factory.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -138498,6 +141614,90 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "addVoidToPromise";
+        var fixId = "addVoidToPromise";
+        var errorCodes = [
+            ts.Diagnostics.Expected_0_arguments_but_got_1_Did_you_forget_to_include_void_in_your_type_argument_to_Promise.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            fixIds: [fixId],
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span, context.program); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixName, changes, ts.Diagnostics.Add_void_to_Promise_resolved_without_a_value, fixId, ts.Diagnostics.Add_void_to_all_Promises_resolved_without_a_value)];
+                }
+            },
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag, context.program, new ts.Set()); });
+            }
+        });
+        function makeChange(changes, sourceFile, span, program, seen) {
+            var node = ts.getTokenAtPosition(sourceFile, span.start);
+            if (!ts.isIdentifier(node) || !ts.isCallExpression(node.parent) || node.parent.expression !== node || node.parent.arguments.length !== 0)
+                return;
+            var checker = program.getTypeChecker();
+            var symbol = checker.getSymbolAtLocation(node);
+            // decl should be `new Promise((<decl>) => {})`
+            var decl = symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration;
+            if (!decl || !ts.isParameter(decl) || !ts.isNewExpression(decl.parent.parent))
+                return;
+            // no need to make this change if we have already seen this parameter.
+            if (seen === null || seen === void 0 ? void 0 : seen.has(decl))
+                return;
+            seen === null || seen === void 0 ? void 0 : seen.add(decl);
+            var typeArguments = getEffectiveTypeArguments(decl.parent.parent);
+            if (ts.some(typeArguments)) {
+                // append ` | void` to type argument
+                var typeArgument = typeArguments[0];
+                var needsParens = !ts.isUnionTypeNode(typeArgument) && !ts.isParenthesizedTypeNode(typeArgument) &&
+                    ts.isParenthesizedTypeNode(ts.factory.createUnionTypeNode([typeArgument, ts.factory.createKeywordTypeNode(113 /* VoidKeyword */)]).types[0]);
+                if (needsParens) {
+                    changes.insertText(sourceFile, typeArgument.pos, "(");
+                }
+                changes.insertText(sourceFile, typeArgument.end, needsParens ? ") | void" : " | void");
+            }
+            else {
+                // make sure the Promise is type is untyped (i.e., `unknown`)
+                var signature = checker.getResolvedSignature(node.parent);
+                var parameter = signature === null || signature === void 0 ? void 0 : signature.parameters[0];
+                var parameterType = parameter && checker.getTypeOfSymbolAtLocation(parameter, decl.parent.parent);
+                if (ts.isInJSFile(decl)) {
+                    if (!parameterType || parameterType.flags & 3 /* AnyOrUnknown */) {
+                        // give the expression a type
+                        changes.insertText(sourceFile, decl.parent.parent.end, ")");
+                        changes.insertText(sourceFile, ts.skipTrivia(sourceFile.text, decl.parent.parent.pos), "/** @type {Promise<void>} */(");
+                    }
+                }
+                else {
+                    if (!parameterType || parameterType.flags & 2 /* Unknown */) {
+                        // add `void` type argument
+                        changes.insertText(sourceFile, decl.parent.parent.expression.end, "<void>");
+                    }
+                }
+            }
+        }
+        function getEffectiveTypeArguments(node) {
+            var _a;
+            if (ts.isInJSFile(node)) {
+                if (ts.isParenthesizedExpression(node.parent)) {
+                    var jsDocType = (_a = ts.getJSDocTypeTag(node.parent)) === null || _a === void 0 ? void 0 : _a.typeExpression.type;
+                    if (jsDocType && ts.isTypeReferenceNode(jsDocType) && ts.isIdentifier(jsDocType.typeName) && ts.idText(jsDocType.typeName) === "Promise") {
+                        return jsDocType.typeArguments;
+                    }
+                }
+            }
+            else {
+                return node.typeArguments;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -138545,16 +141745,16 @@ var ts;
                 return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.This_file_already_has_a_default_export) };
             }
             switch (exportNode.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 253 /* ModuleDeclaration */: {
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 256 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { info: { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } } : undefined;
                 }
-                case 229 /* VariableStatement */: {
+                case 232 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -138582,22 +141782,23 @@ var ts;
             else {
                 var exportKeyword = ts.Debug.checkDefined(ts.findModifier(exportNode, 92 /* ExportKeyword */), "Should find an export keyword in modifier list");
                 switch (exportNode.kind) {
-                    case 248 /* FunctionDeclaration */:
-                    case 249 /* ClassDeclaration */:
-                    case 250 /* InterfaceDeclaration */:
+                    case 251 /* FunctionDeclaration */:
+                    case 252 /* ClassDeclaration */:
+                    case 253 /* InterfaceDeclaration */:
                         changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.factory.createToken(87 /* DefaultKeyword */));
                         break;
-                    case 229 /* VariableStatement */:
-                        // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
-                        if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
+                    case 232 /* VariableStatement */:
+                        // If 'x' isn't used in this file and doesn't have type definition, `export const x = 0;` --> `export default 0;`
+                        var decl = ts.first(exportNode.declarationList.declarations);
+                        if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile) && !decl.type) {
                             // We checked in `getInfo` that an initializer exists.
-                            changes.replaceNode(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.Debug.checkDefined(ts.first(exportNode.declarationList.declarations).initializer, "Initializer was previously known to be present")));
+                            changes.replaceNode(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.Debug.checkDefined(decl.initializer, "Initializer was previously known to be present")));
                             break;
                         }
                     // falls through
-                    case 252 /* EnumDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 253 /* ModuleDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 256 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.factory.createIdentifier(exportName.text)));
@@ -138624,18 +141825,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier(exportName));
                     break;
-                case 262 /* ImportSpecifier */:
-                case 267 /* ExportSpecifier */: {
+                case 265 /* ImportSpecifier */:
+                case 270 /* 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 259 /* ImportClause */: {
+                case 262 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref, "Import clause name should match provided ref");
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -138644,7 +141845,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.factory.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 260 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 263 /* 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 */;
@@ -138665,11 +141866,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 198 /* PropertyAccessExpression */:
+                case 201 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier("default"));
                     break;
-                case 262 /* ImportSpecifier */: {
+                case 265 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.factory.createIdentifier(parent.name.text);
@@ -138682,7 +141883,7 @@ var ts;
                     }
                     break;
                 }
-                case 267 /* ExportSpecifier */: {
+                case 270 /* 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";`
@@ -138716,8 +141917,8 @@ var ts;
                 if (!i)
                     return ts.emptyArray;
                 if (i.error === undefined) {
-                    var description = i.info.kind === 260 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                    var actionName = i.info.kind === 260 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                    var description = i.info.kind === 263 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                    var actionName = i.info.kind === 263 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                     return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
                 }
                 if (context.preferences.provideRefactorNotApplicableReason) {
@@ -138756,7 +141957,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 260 /* NamespaceImport */) {
+            if (toConvert.kind === 263 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -138927,7 +142128,6 @@ var ts;
                 if (!finalExpression || checker.isNullableType(checker.getTypeAtLocation(finalExpression))) {
                     return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_convertible_access_expression) };
                 }
-                ;
                 if ((ts.isPropertyAccessExpression(condition) || ts.isIdentifier(condition))
                     && getMatchingStart(condition, finalExpression.expression)) {
                     return { info: { finalExpression: finalExpression, occurrences: [condition], expression: expression } };
@@ -138974,23 +142174,25 @@ var ts;
              * Returns subchain if chain begins with subchain syntactically.
              */
             function getMatchingStart(chain, subchain) {
-                return (ts.isIdentifier(subchain) || ts.isPropertyAccessExpression(subchain)) &&
-                    chainStartsWith(chain, subchain) ? subchain : undefined;
+                if (!ts.isIdentifier(subchain) && !ts.isPropertyAccessExpression(subchain) && !ts.isElementAccessExpression(subchain)) {
+                    return undefined;
+                }
+                return chainStartsWith(chain, subchain) ? subchain : undefined;
             }
             /**
              * Returns true if chain begins with subchain syntactically.
              */
             function chainStartsWith(chain, subchain) {
                 // skip until we find a matching identifier.
-                while (ts.isCallExpression(chain) || ts.isPropertyAccessExpression(chain)) {
-                    var subchainName = ts.isPropertyAccessExpression(subchain) ? subchain.name.getText() : subchain.getText();
-                    if (ts.isPropertyAccessExpression(chain) && chain.name.getText() === subchainName)
+                while (ts.isCallExpression(chain) || ts.isPropertyAccessExpression(chain) || ts.isElementAccessExpression(chain)) {
+                    if (getTextOfChainNode(chain) === getTextOfChainNode(subchain))
                         break;
                     chain = chain.expression;
                 }
-                // check that the chains match at each access.  Call chains in subchain are not valid.
-                while (ts.isPropertyAccessExpression(chain) && ts.isPropertyAccessExpression(subchain)) {
-                    if (chain.name.getText() !== subchain.name.getText())
+                // check that the chains match at each access. Call chains in subchain are not valid.
+                while ((ts.isPropertyAccessExpression(chain) && ts.isPropertyAccessExpression(subchain)) ||
+                    (ts.isElementAccessExpression(chain) && ts.isElementAccessExpression(subchain))) {
+                    if (getTextOfChainNode(chain) !== getTextOfChainNode(subchain))
                         return false;
                     chain = chain.expression;
                     subchain = subchain.expression;
@@ -138998,6 +142200,18 @@ var ts;
                 // check if we have reached a final identifier.
                 return ts.isIdentifier(chain) && ts.isIdentifier(subchain) && chain.getText() === subchain.getText();
             }
+            function getTextOfChainNode(node) {
+                if (ts.isIdentifier(node) || ts.isStringOrNumericLiteralLike(node)) {
+                    return node.getText();
+                }
+                if (ts.isPropertyAccessExpression(node)) {
+                    return getTextOfChainNode(node.name);
+                }
+                if (ts.isElementAccessExpression(node)) {
+                    return getTextOfChainNode(node.argumentExpression);
+                }
+                return undefined;
+            }
             /**
              * Find the least ancestor of the input node that is a valid type for extraction and contains the input span.
              */
@@ -139050,7 +142264,7 @@ var ts;
                     return getFinalExpressionInChain(node.left);
                 }
                 // foo && |foo.bar()()| - nested calls are treated like further accesses.
-                else if ((ts.isPropertyAccessExpression(node) || ts.isCallExpression(node)) && !ts.isOptionalChain(node)) {
+                else if ((ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node) || ts.isCallExpression(node)) && !ts.isOptionalChain(node)) {
                     return node;
                 }
                 return undefined;
@@ -139059,7 +142273,7 @@ var ts;
              * Creates an access chain from toConvert with '?.' accesses at expressions appearing in occurrences.
              */
             function convertOccurrences(checker, toConvert, occurrences) {
-                if (ts.isPropertyAccessExpression(toConvert) || ts.isCallExpression(toConvert)) {
+                if (ts.isPropertyAccessExpression(toConvert) || ts.isElementAccessExpression(toConvert) || ts.isCallExpression(toConvert)) {
                     var chain = convertOccurrences(checker, toConvert.expression, occurrences);
                     var lastOccurrence = occurrences.length > 0 ? occurrences[occurrences.length - 1] : undefined;
                     var isOccurrence = (lastOccurrence === null || lastOccurrence === void 0 ? void 0 : lastOccurrence.getText()) === toConvert.expression.getText();
@@ -139075,6 +142289,11 @@ var ts;
                             ts.factory.createPropertyAccessChain(chain, ts.factory.createToken(28 /* QuestionDotToken */), toConvert.name) :
                             ts.factory.createPropertyAccessChain(chain, toConvert.questionDotToken, toConvert.name);
                     }
+                    else if (ts.isElementAccessExpression(toConvert)) {
+                        return isOccurrence ?
+                            ts.factory.createElementAccessChain(chain, ts.factory.createToken(28 /* QuestionDotToken */), toConvert.argumentExpression) :
+                            ts.factory.createElementAccessChain(chain, toConvert.questionDotToken, toConvert.argumentExpression);
+                    }
                 }
                 return toConvert;
             }
@@ -139082,7 +142301,7 @@ var ts;
                 var finalExpression = info.finalExpression, occurrences = info.occurrences, expression = info.expression;
                 var firstOccurrence = occurrences[occurrences.length - 1];
                 var convertedChain = convertOccurrences(checker, finalExpression, occurrences);
-                if (convertedChain && (ts.isPropertyAccessExpression(convertedChain) || ts.isCallExpression(convertedChain))) {
+                if (convertedChain && (ts.isPropertyAccessExpression(convertedChain) || ts.isElementAccessExpression(convertedChain) || ts.isCallExpression(convertedChain))) {
                     if (ts.isBinaryExpression(expression)) {
                         changes.replaceNodeRange(sourceFile, firstOccurrence, finalExpression, convertedChain);
                     }
@@ -139127,27 +142346,27 @@ var ts;
                 var lastDeclaration = signatureDecls[signatureDecls.length - 1];
                 var updated = lastDeclaration;
                 switch (lastDeclaration.kind) {
-                    case 163 /* MethodSignature */: {
+                    case 164 /* MethodSignature */: {
                         updated = ts.factory.updateMethodSignature(lastDeclaration, lastDeclaration.modifiers, lastDeclaration.name, lastDeclaration.questionToken, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 164 /* MethodDeclaration */: {
+                    case 165 /* MethodDeclaration */: {
                         updated = ts.factory.updateMethodDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, lastDeclaration.asteriskToken, lastDeclaration.name, lastDeclaration.questionToken, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type, lastDeclaration.body);
                         break;
                     }
-                    case 168 /* CallSignature */: {
+                    case 169 /* CallSignature */: {
                         updated = ts.factory.updateCallSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 165 /* Constructor */: {
+                    case 166 /* Constructor */: {
                         updated = ts.factory.updateConstructorDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.body);
                         break;
                     }
-                    case 169 /* ConstructSignature */: {
+                    case 170 /* ConstructSignature */: {
                         updated = ts.factory.updateConstructSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 248 /* FunctionDeclaration */: {
+                    case 251 /* FunctionDeclaration */: {
                         updated = ts.factory.updateFunctionDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, lastDeclaration.asteriskToken, lastDeclaration.name, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type, lastDeclaration.body);
                         break;
                     }
@@ -139199,12 +142418,12 @@ var ts;
             }
             function isConvertableSignatureDeclaration(d) {
                 switch (d.kind) {
-                    case 163 /* MethodSignature */:
-                    case 164 /* MethodDeclaration */:
-                    case 168 /* CallSignature */:
-                    case 165 /* Constructor */:
-                    case 169 /* ConstructSignature */:
-                    case 248 /* FunctionDeclaration */:
+                    case 164 /* MethodSignature */:
+                    case 165 /* MethodDeclaration */:
+                    case 169 /* CallSignature */:
+                    case 166 /* Constructor */:
+                    case 170 /* ConstructSignature */:
+                    case 251 /* FunctionDeclaration */:
                         return true;
                 }
                 return false;
@@ -139567,20 +142786,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 162 /* PropertyDeclaration */) {
+                        if (current.kind === 163 /* PropertyDeclaration */) {
                             if (ts.hasSyntacticModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 159 /* Parameter */) {
+                        else if (current.kind === 160 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 165 /* Constructor */) {
+                            if (ctorOrMethod.kind === 166 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 164 /* MethodDeclaration */) {
+                        else if (current.kind === 165 /* MethodDeclaration */) {
                             if (ts.hasSyntacticModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -139623,7 +142842,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 246 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 249 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasSyntacticModifier(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`!
@@ -139635,13 +142854,16 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 258 /* ImportDeclaration */:
+                            case 261 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
+                            case 266 /* ExportAssignment */:
+                                (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractExportedEntity));
+                                return true;
                             case 105 /* 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 === 200 /* CallExpression */) {
+                                if (node.parent.kind === 203 /* 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)) {
@@ -139653,7 +142875,7 @@ var ts;
                                     rangeFacts |= RangeFacts.UsesThis;
                                 }
                                 break;
-                            case 206 /* ArrowFunction */:
+                            case 209 /* ArrowFunction */:
                                 // check if arrow function uses this
                                 ts.forEachChild(node, function check(n) {
                                     if (ts.isThis(n)) {
@@ -139667,39 +142889,39 @@ var ts;
                                     }
                                 });
                             // falls through
-                            case 249 /* ClassDeclaration */:
-                            case 248 /* FunctionDeclaration */:
+                            case 252 /* ClassDeclaration */:
+                            case 251 /* FunctionDeclaration */:
                                 if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                     // You cannot extract global declarations
                                     (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
                                 }
                             // falls through
-                            case 218 /* ClassExpression */:
-                            case 205 /* FunctionExpression */:
-                            case 164 /* MethodDeclaration */:
-                            case 165 /* Constructor */:
-                            case 166 /* GetAccessor */:
-                            case 167 /* SetAccessor */:
+                            case 221 /* ClassExpression */:
+                            case 208 /* FunctionExpression */:
+                            case 165 /* MethodDeclaration */:
+                            case 166 /* Constructor */:
+                            case 167 /* GetAccessor */:
+                            case 168 /* SetAccessor */:
                                 // do not dive into functions or classes
                                 return false;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 231 /* IfStatement */:
+                            case 234 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 244 /* TryStatement */:
+                            case 247 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 227 /* Block */:
-                                if (node.parent && node.parent.kind === 244 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 230 /* Block */:
+                                if (node.parent && node.parent.kind === 247 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 282 /* DefaultClause */:
-                            case 281 /* CaseClause */:
+                            case 285 /* DefaultClause */:
+                            case 284 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -139711,19 +142933,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 186 /* ThisType */:
+                            case 187 /* ThisType */:
                             case 107 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 242 /* LabeledStatement */: {
+                            case 245 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 238 /* BreakStatement */:
-                            case 237 /* ContinueStatement */: {
+                            case 241 /* BreakStatement */:
+                            case 240 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -139732,20 +142954,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 238 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 241 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 210 /* AwaitExpression */:
+                            case 213 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 216 /* YieldExpression */:
+                            case 219 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 239 /* ReturnStatement */:
+                            case 242 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -139799,7 +143021,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 === 159 /* Parameter */) {
+                    if (current.kind === 160 /* 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;
                     }
@@ -139810,7 +143032,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 294 /* SourceFile */) {
+                        if (current.kind === 297 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -139900,32 +143122,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         return "constructor";
-                    case 205 /* FunctionExpression */:
-                    case 248 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 251 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : ts.ANONYMOUS;
-                    case 206 /* ArrowFunction */:
+                    case 209 /* ArrowFunction */:
                         return "arrow function";
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 166 /* GetAccessor */:
+                    case 167 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 167 /* SetAccessor */:
+                    case 168 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope, "Unexpected scope kind " + scope.kind);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 249 /* ClassDeclaration */
+                return scope.kind === 252 /* 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 === 254 /* ModuleBlock */
+                return scope.kind === 257 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -140151,9 +143373,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 149 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 150 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.factory.createUnionTypeNode([clone, ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */)]);
+                        : ts.factory.createUnionTypeNode([clone, ts.factory.createKeywordTypeNode(150 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -140182,7 +143404,7 @@ var ts;
                     if (rangeFacts & RangeFacts.InStaticRegion) {
                         modifiers.push(ts.factory.createModifier(123 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.factory.createModifier(141 /* ReadonlyKeyword */));
+                    modifiers.push(ts.factory.createModifier(142 /* ReadonlyKeyword */));
                     var newVariable = ts.factory.createPropertyDeclaration(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -140214,7 +143436,7 @@ var ts;
                         var localReference = ts.factory.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 230 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 233 /* 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.factory.createVariableStatement(
@@ -140233,7 +143455,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 230 /* ExpressionStatement */) {
+                        if (node.parent.kind === 233 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -140560,7 +143782,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: new ts.Map(), typeParameterUsages: new ts.Map(), substitutions: new ts.Map() });
                     substitutionsPerScope.push(new ts.Map());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 248 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 251 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -140879,30 +144101,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 288 /* EnumMember */:
+                    case 291 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 258 /* ImportDeclaration */ &&
-                            parent.kind !== 262 /* ImportSpecifier */;
-                    case 217 /* SpreadElement */:
-                    case 193 /* ObjectBindingPattern */:
-                    case 195 /* BindingElement */:
+                        return parent.kind !== 261 /* ImportDeclaration */ &&
+                            parent.kind !== 265 /* ImportSpecifier */;
+                    case 220 /* SpreadElement */:
+                    case 196 /* ObjectBindingPattern */:
+                    case 198 /* BindingElement */:
                         return false;
                     case 78 /* Identifier */:
-                        return parent.kind !== 195 /* BindingElement */ &&
-                            parent.kind !== 262 /* ImportSpecifier */ &&
-                            parent.kind !== 267 /* ExportSpecifier */;
+                        return parent.kind !== 198 /* BindingElement */ &&
+                            parent.kind !== 265 /* ImportSpecifier */ &&
+                            parent.kind !== 270 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 227 /* Block */:
-                    case 294 /* SourceFile */:
-                    case 254 /* ModuleBlock */:
-                    case 281 /* CaseClause */:
+                    case 230 /* Block */:
+                    case 297 /* SourceFile */:
+                    case 257 /* ModuleBlock */:
+                    case 284 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -141035,7 +144257,7 @@ var ts;
                         if (symbol) {
                             var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
                             if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
-                                result.push(declaration);
+                                ts.pushIfUnique(result, declaration);
                             }
                         }
                     }
@@ -141077,16 +144299,18 @@ var ts;
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.factory.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
             changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
-            changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+            changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })), { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.ExcludeWhitespace });
         }
         function doInterfaceChange(changes, file, name, info) {
+            var _a;
             var firstStatement = info.firstStatement, selection = info.selection, typeParameters = info.typeParameters, typeElements = info.typeElements;
             var newTypeNode = ts.factory.createInterfaceDeclaration(
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters, 
             /* heritageClauses */ undefined, typeElements);
+            ts.setTextRange(newTypeNode, (_a = typeElements[0]) === null || _a === void 0 ? void 0 : _a.parent);
             changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
-            changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+            changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })), { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.ExcludeWhitespace });
         }
         function doTypedefChange(changes, file, name, info) {
             var firstStatement = info.firstStatement, selection = info.selection, typeParameters = info.typeParameters;
@@ -141116,10 +144340,10 @@ var ts;
                 getEditsForAction: function (context, actionName) {
                     if (!context.endPosition)
                         return undefined;
-                    var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition);
+                    var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.program, context.startPosition, context.endPosition);
                     if (!info || !info.info)
                         return undefined;
-                    var edits = ts.codefix.generateAccessorFromProperty(context.file, context.startPosition, context.endPosition, context, actionName);
+                    var edits = ts.codefix.generateAccessorFromProperty(context.file, context.program, context.startPosition, context.endPosition, context, actionName);
                     if (!edits)
                         return undefined;
                     var renameFilename = context.file.fileName;
@@ -141131,7 +144355,7 @@ var ts;
                 getAvailableActions: function (context) {
                     if (!context.endPosition)
                         return ts.emptyArray;
-                    var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition, context.triggerReason === "invoked");
+                    var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.program, context.startPosition, context.endPosition, context.triggerReason === "invoked");
                     if (!info)
                         return ts.emptyArray;
                     if (!info.error) {
@@ -141217,7 +144441,6 @@ var ts;
             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)
@@ -141225,20 +144448,27 @@ var ts;
             var all = [];
             var ranges = [];
             var toMove = rangeToMove.toMove, afterLast = rangeToMove.afterLast;
-            ts.getRangesWhere(toMove, function (s) { return !isPureImport(s); }, function (start, afterEndIndex) {
+            ts.getRangesWhere(toMove, isAllowedStatementToMove, 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 isAllowedStatementToMove(statement) {
+            // Filters imports and prologue directives 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.
+            // Prologue directives will be copied to the new file and should be left in the old file.
+            return !isPureImport(statement) && !ts.isPrologueDirective(statement);
+            ;
+        }
         function isPureImport(node) {
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return true;
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return !ts.hasSyntacticModifier(node, 1 /* Export */);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -141260,9 +144490,10 @@ var ts;
         }
         function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences) {
             var checker = program.getTypeChecker();
+            var prologueDirectives = ts.takeWhile(oldFile.statements, ts.isPrologueDirective);
             if (!oldFile.externalModuleIndicator && !oldFile.commonJsModuleIndicator) {
                 deleteMovedStatements(oldFile, toMove.ranges, changes);
-                return toMove.all;
+                return __spreadArrays(prologueDirectives, toMove.all);
             }
             var useEs6ModuleSyntax = !!oldFile.externalModuleIndicator;
             var quotePreference = ts.getQuotePreference(oldFile, preferences);
@@ -141276,11 +144507,11 @@ var ts;
             var imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference);
             var body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax);
             if (imports.length && body.length) {
-                return __spreadArrays(imports, [
+                return __spreadArrays(prologueDirectives, imports, [
                     4 /* NewLineTrivia */
                 ], body);
             }
-            return __spreadArrays(imports, body);
+            return __spreadArrays(prologueDirectives, imports, body);
         }
         function deleteMovedStatements(sourceFile, moved, changes) {
             for (var _i = 0, moved_1 = moved; _i < moved_1.length; _i++) {
@@ -141333,12 +144564,12 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 260 /* NamespaceImport */ ?
+                case 261 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 263 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind);
@@ -141369,20 +144600,20 @@ var ts;
             var newNamespaceId = ts.factory.createIdentifier(newNamespaceName);
             var newModuleString = ts.factory.createStringLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     return ts.factory.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*name*/ undefined, ts.factory.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return ts.factory.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.factory.createExternalModuleReference(newModuleString));
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return ts.factory.createVariableDeclaration(newNamespaceId, /*exclamationToken*/ undefined, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 258 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 257 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 261 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 260 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -141452,15 +144683,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 258 /* ImportDeclaration */:
+                case 261 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -141473,7 +144704,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 260 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 263 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -141485,7 +144716,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.replaceNode(sourceFile, importDecl.importClause, ts.factory.updateImportClause(importDecl.importClause, importDecl.importClause.isTypeOnly, name, /*namedBindings*/ undefined));
                     }
-                    else if (namedBindings.kind === 261 /* NamedImports */) {
+                    else if (namedBindings.kind === 264 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -141503,9 +144734,9 @@ var ts;
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 194 /* ArrayBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
                     break;
-                case 193 /* ObjectBindingPattern */:
+                case 196 /* 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);
                     }
@@ -141632,14 +144863,14 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 257 /* ImportEqualsDeclaration */:
-                case 262 /* ImportSpecifier */:
-                case 259 /* ImportClause */:
-                case 260 /* NamespaceImport */:
+                case 260 /* ImportEqualsDeclaration */:
+                case 265 /* ImportSpecifier */:
+                case 262 /* ImportClause */:
+                case 263 /* NamespaceImport */:
                     return true;
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -141651,7 +144882,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 258 /* ImportDeclaration */: {
+                case 261 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -141661,9 +144892,9 @@ var ts;
                         ? ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 246 /* VariableDeclaration */: {
+                case 249 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -141672,7 +144903,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 260 /* NamespaceImport */) {
+            if (namedBindings.kind === 263 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -141684,9 +144915,9 @@ var ts;
             switch (name.kind) {
                 case 78 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 194 /* ArrayBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
                     return name;
-                case 193 /* ObjectBindingPattern */: {
+                case 196 /* 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.factory.createObjectBindingPattern(newElements) : undefined;
@@ -141743,13 +144974,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 257 /* ImportEqualsDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -141757,17 +144988,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
-                case 253 /* ModuleDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 257 /* ImportEqualsDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 230 /* ExpressionStatement */: {
+                case 233 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -141779,8 +145010,8 @@ var ts;
             switch (name.kind) {
                 case 78 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 194 /* ArrayBindingPattern */:
-                case 193 /* ObjectBindingPattern */:
+                case 197 /* ArrayBindingPattern */:
+                case 196 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name, "Unexpected name kind " + name.kind);
@@ -141791,9 +145022,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 246 /* VariableDeclaration */:
+                case 249 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 195 /* BindingElement */:
+                case 198 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -141826,23 +145057,23 @@ var ts;
         function addEs6Export(d) {
             var modifiers = ts.concatenate([ts.factory.createModifier(92 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 248 /* FunctionDeclaration */:
+                case 251 /* FunctionDeclaration */:
                     return ts.factory.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 249 /* ClassDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return ts.factory.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return ts.factory.updateVariableStatement(d, modifiers, d.declarationList);
-                case 253 /* ModuleDeclaration */:
+                case 256 /* ModuleDeclaration */:
                     return ts.factory.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 252 /* EnumDeclaration */:
+                case 255 /* EnumDeclaration */:
                     return ts.factory.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 251 /* TypeAliasDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
                     return ts.factory.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 250 /* InterfaceDeclaration */:
+                case 253 /* InterfaceDeclaration */:
                     return ts.factory.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 257 /* ImportEqualsDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return ts.factory.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d, "Unexpected declaration kind " + d.kind);
@@ -141853,18 +145084,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 248 /* FunctionDeclaration */:
-                case 249 /* ClassDeclaration */:
+                case 251 /* FunctionDeclaration */:
+                case 252 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 229 /* VariableStatement */:
+                case 232 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 253 /* ModuleDeclaration */:
-                case 252 /* EnumDeclaration */:
-                case 251 /* TypeAliasDeclaration */:
-                case 250 /* InterfaceDeclaration */:
-                case 257 /* ImportEqualsDeclaration */:
+                case 256 /* ModuleDeclaration */:
+                case 255 /* EnumDeclaration */:
+                case 254 /* TypeAliasDeclaration */:
+                case 253 /* InterfaceDeclaration */:
+                case 260 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 230 /* ExpressionStatement */:
+                case 233 /* ExpressionStatement */:
                     return ts.Debug.fail("Can't export an ExpressionStatement"); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl, "Unexpected decl kind " + decl.kind);
@@ -142169,15 +145400,15 @@ var ts;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
                         // foo(...) or super(...) or new Foo(...)
-                        case 200 /* CallExpression */:
-                        case 201 /* NewExpression */:
+                        case 203 /* CallExpression */:
+                        case 204 /* NewExpression */:
                             var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
                             if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
                                 return callOrNewExpression;
                             }
                             break;
                         // x.foo(...)
-                        case 198 /* PropertyAccessExpression */:
+                        case 201 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
                                 var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
@@ -142187,7 +145418,7 @@ var ts;
                             }
                             break;
                         // x["foo"](...)
-                        case 199 /* ElementAccessExpression */:
+                        case 202 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
                                 var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
@@ -142206,14 +145437,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 198 /* PropertyAccessExpression */:
+                        case 201 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 199 /* ElementAccessExpression */:
+                        case 202 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -142255,11 +145486,11 @@ var ts;
                 if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 248 /* FunctionDeclaration */:
+                    case 251 /* FunctionDeclaration */:
                         return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         return isSingleImplementation(functionDeclaration, checker);
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
                             return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
@@ -142267,8 +145498,8 @@ var ts;
                             return isValidVariableDeclaration(functionDeclaration.parent.parent)
                                 && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 205 /* FunctionExpression */:
-                    case 206 /* ArrowFunction */:
+                    case 208 /* FunctionExpression */:
+                    case 209 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
@@ -142418,7 +145649,7 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 249 /* ClassDeclaration */:
+                    case 252 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
                         if (classDeclaration.name)
                             return [classDeclaration.name];
@@ -142426,7 +145657,7 @@ var ts;
                         // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
                         var defaultModifier = ts.Debug.checkDefined(ts.findModifier(classDeclaration, 87 /* DefaultKeyword */), "Nameless class declaration should be a default export");
                         return [defaultModifier];
-                    case 218 /* ClassExpression */:
+                    case 221 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -142437,25 +145668,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 248 /* FunctionDeclaration */:
+                    case 251 /* 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.checkDefined(ts.findModifier(functionDeclaration, 87 /* DefaultKeyword */), "Nameless function declaration should be a default export");
                         return [defaultModifier];
-                    case 164 /* MethodDeclaration */:
+                    case 165 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 165 /* Constructor */:
+                    case 166 /* Constructor */:
                         var ctrKeyword = ts.Debug.checkDefined(ts.findChildOfKind(functionDeclaration, 132 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
-                        if (functionDeclaration.parent.kind === 218 /* ClassExpression */) {
+                        if (functionDeclaration.parent.kind === 221 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 206 /* ArrowFunction */:
+                    case 209 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 205 /* FunctionExpression */:
+                    case 208 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -142531,10 +145762,18 @@ var ts;
                 return node.operatorToken.kind !== 62 /* EqualsToken */;
             }
             function getParentBinaryExpression(expr) {
-                while (ts.isBinaryExpression(expr.parent) && isNotEqualsOperator(expr.parent)) {
-                    expr = expr.parent;
-                }
-                return expr;
+                var container = ts.findAncestor(expr.parent, function (n) {
+                    switch (n.kind) {
+                        case 201 /* PropertyAccessExpression */:
+                        case 202 /* ElementAccessExpression */:
+                            return false;
+                        case 216 /* BinaryExpression */:
+                            return !(ts.isBinaryExpression(n.parent) && isNotEqualsOperator(n.parent));
+                        default:
+                            return "quit";
+                    }
+                });
+                return container || expr;
             }
             function isStringConcatenationValid(node) {
                 var _a = treeToArray(node), containsString = _a.containsString, areOperatorsValid = _a.areOperatorsValid;
@@ -142883,8 +146122,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 298 /* FirstJSDocNode */ || kid.kind > 328 /* LastJSDocNode */; });
-            return child.kind < 156 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 301 /* FirstJSDocNode */ || kid.kind > 333 /* LastJSDocNode */; });
+            return child.kind < 157 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -142895,7 +146134,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 156 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 157 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -142953,7 +146192,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(329 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(334 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -143064,13 +146303,13 @@ var ts;
         };
         SymbolObject.prototype.getContextualDocumentationComment = function (context, checker) {
             switch (context === null || context === void 0 ? void 0 : context.kind) {
-                case 166 /* GetAccessor */:
+                case 167 /* GetAccessor */:
                     if (!this.contextualGetAccessorDocumentationComment) {
                         this.contextualGetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualGetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isGetAccessor), checker);
                     }
                     return this.contextualGetAccessorDocumentationComment;
-                case 167 /* SetAccessor */:
+                case 168 /* SetAccessor */:
                     if (!this.contextualSetAccessorDocumentationComment) {
                         this.contextualSetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualSetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isSetAccessor), checker);
@@ -143291,7 +146530,7 @@ var ts;
         __extends(SourceFileObject, _super);
         function SourceFileObject(kind, pos, end) {
             var _this = _super.call(this, kind, pos, end) || this;
-            _this.kind = 294 /* SourceFile */;
+            _this.kind = 297 /* SourceFile */;
             return _this;
         }
         SourceFileObject.prototype.update = function (newText, textChangeRange) {
@@ -143350,10 +146589,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 248 /* FunctionDeclaration */:
-                    case 205 /* FunctionExpression */:
-                    case 164 /* MethodDeclaration */:
-                    case 163 /* MethodSignature */:
+                    case 251 /* FunctionDeclaration */:
+                    case 208 /* FunctionExpression */:
+                    case 165 /* MethodDeclaration */:
+                    case 164 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -143373,31 +146612,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 249 /* ClassDeclaration */:
-                    case 218 /* ClassExpression */:
-                    case 250 /* InterfaceDeclaration */:
-                    case 251 /* TypeAliasDeclaration */:
-                    case 252 /* EnumDeclaration */:
-                    case 253 /* ModuleDeclaration */:
-                    case 257 /* ImportEqualsDeclaration */:
-                    case 267 /* ExportSpecifier */:
-                    case 262 /* ImportSpecifier */:
-                    case 259 /* ImportClause */:
-                    case 260 /* NamespaceImport */:
-                    case 166 /* GetAccessor */:
-                    case 167 /* SetAccessor */:
-                    case 176 /* TypeLiteral */:
+                    case 252 /* ClassDeclaration */:
+                    case 221 /* ClassExpression */:
+                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* TypeAliasDeclaration */:
+                    case 255 /* EnumDeclaration */:
+                    case 256 /* ModuleDeclaration */:
+                    case 260 /* ImportEqualsDeclaration */:
+                    case 270 /* ExportSpecifier */:
+                    case 265 /* ImportSpecifier */:
+                    case 262 /* ImportClause */:
+                    case 263 /* NamespaceImport */:
+                    case 167 /* GetAccessor */:
+                    case 168 /* SetAccessor */:
+                    case 177 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 159 /* Parameter */:
+                    case 160 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 246 /* VariableDeclaration */:
-                    case 195 /* BindingElement */: {
+                    case 249 /* VariableDeclaration */:
+                    case 198 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -143408,12 +146647,12 @@ var ts;
                         }
                     }
                     // falls through
-                    case 288 /* EnumMember */:
-                    case 162 /* PropertyDeclaration */:
-                    case 161 /* PropertySignature */:
+                    case 291 /* EnumMember */:
+                    case 163 /* PropertyDeclaration */:
+                    case 162 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 264 /* ExportDeclaration */:
+                    case 267 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         var exportDeclaration = node;
@@ -143426,7 +146665,7 @@ var ts;
                             }
                         }
                         break;
-                    case 258 /* ImportDeclaration */:
+                    case 261 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -143438,7 +146677,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 260 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 263 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -143447,7 +146686,7 @@ var ts;
                             }
                         }
                         break;
-                    case 213 /* BinaryExpression */:
+                    case 216 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -144102,12 +147341,12 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 198 /* PropertyAccessExpression */:
-                case 156 /* QualifiedName */:
+                case 201 /* PropertyAccessExpression */:
+                case 157 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
                 case 107 /* ThisKeyword */:
-                case 186 /* ThisType */:
+                case 187 /* ThisType */:
                 case 105 /* SuperKeyword */:
                     return true;
                 default:
@@ -144192,7 +147431,7 @@ var ts;
          * This is a semantic operation.
          */
         function getSignatureHelpItems(fileName, position, _a) {
-            var triggerReason = (_a === void 0 ? ts.emptyOptions : _a).triggerReason;
+            var _b = _a === void 0 ? ts.emptyOptions : _a, triggerReason = _b.triggerReason;
             synchronizeHostData();
             var sourceFile = getValidSourceFile(fileName);
             return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, triggerReason, cancellationToken);
@@ -144209,15 +147448,15 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 198 /* PropertyAccessExpression */:
-                case 156 /* QualifiedName */:
+                case 201 /* PropertyAccessExpression */:
+                case 157 /* QualifiedName */:
                 case 10 /* StringLiteral */:
                 case 94 /* FalseKeyword */:
                 case 109 /* TrueKeyword */:
                 case 103 /* NullKeyword */:
                 case 105 /* SuperKeyword */:
                 case 107 /* ThisKeyword */:
-                case 186 /* ThisType */:
+                case 187 /* ThisType */:
                 case 78 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -144234,7 +147473,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 === 253 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 256 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -144266,21 +147505,33 @@ var ts;
             var kind = ts.getScriptKind(fileName, host);
             return kind === 3 /* TS */ || kind === 4 /* TSX */;
         }
-        function getSemanticClassifications(fileName, span) {
+        function getSemanticClassifications(fileName, span, format) {
             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);
+            var responseFormat = format || "original" /* Original */;
+            if (responseFormat === "2020" /* TwentyTwenty */) {
+                return ts.classifier.v2020.getSemanticClassifications(program, cancellationToken, getValidSourceFile(fileName), span);
+            }
+            else {
+                return ts.getSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
+            }
         }
-        function getEncodedSemanticClassifications(fileName, span) {
+        function getEncodedSemanticClassifications(fileName, span, format) {
             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);
+            var responseFormat = format || "original" /* Original */;
+            if (responseFormat === "original" /* Original */) {
+                return ts.getEncodedSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
+            }
+            else {
+                return ts.classifier.v2020.getEncodedSemanticClassifications(program, cancellationToken, getValidSourceFile(fileName), span);
+            }
         }
         function getSyntacticClassifications(fileName, span) {
             // doesn't use compiler - no need to synchronize with host
@@ -144461,6 +147712,10 @@ var ts;
             }
             // Push all text changes.
             for (var i = firstLine; i <= lastLine; i++) {
+                // If the range is multiline and ends on a beginning of a line, don't comment/uncomment.
+                if (firstLine !== lastLine && lineStarts[i] === textRange.end) {
+                    continue;
+                }
                 var lineTextStart = lineTextStarts.get(i.toString());
                 // If the line is not an empty line; otherwise no-op.
                 if (lineTextStart !== undefined) {
@@ -144939,7 +148194,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 269 /* ExternalModuleReference */ ||
+            node.parent.kind === 272 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -144957,13 +148212,13 @@ var ts;
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 157 /* ComputedPropertyName */) {
+                if (node.parent.kind === 158 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
             case 78 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 197 /* ObjectLiteralExpression */ || node.parent.parent.kind === 278 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 200 /* ObjectLiteralExpression */ || node.parent.parent.kind === 281 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -145005,7 +148260,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 199 /* ElementAccessExpression */ &&
+            node.parent.kind === 202 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -145085,114 +148340,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 229 /* VariableStatement */:
+                        case 232 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 246 /* VariableDeclaration */:
-                        case 162 /* PropertyDeclaration */:
-                        case 161 /* PropertySignature */:
+                        case 249 /* VariableDeclaration */:
+                        case 163 /* PropertyDeclaration */:
+                        case 162 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 159 /* Parameter */:
+                        case 160 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 248 /* FunctionDeclaration */:
-                        case 164 /* MethodDeclaration */:
-                        case 163 /* MethodSignature */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
-                        case 165 /* Constructor */:
-                        case 205 /* FunctionExpression */:
-                        case 206 /* ArrowFunction */:
+                        case 251 /* FunctionDeclaration */:
+                        case 165 /* MethodDeclaration */:
+                        case 164 /* MethodSignature */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
+                        case 166 /* Constructor */:
+                        case 208 /* FunctionExpression */:
+                        case 209 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 227 /* Block */:
+                        case 230 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 254 /* ModuleBlock */:
+                        case 257 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 284 /* CatchClause */:
+                        case 287 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 230 /* ExpressionStatement */:
+                        case 233 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 239 /* ReturnStatement */:
+                        case 242 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 233 /* WhileStatement */:
+                        case 236 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 232 /* DoStatement */:
+                        case 235 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 245 /* DebuggerStatement */:
+                        case 248 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 231 /* IfStatement */:
+                        case 234 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 242 /* LabeledStatement */:
+                        case 245 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 238 /* BreakStatement */:
-                        case 237 /* ContinueStatement */:
+                        case 241 /* BreakStatement */:
+                        case 240 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 234 /* ForStatement */:
+                        case 237 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 235 /* ForInStatement */:
+                        case 238 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 236 /* ForOfStatement */:
+                        case 239 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 241 /* SwitchStatement */:
+                        case 244 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 281 /* CaseClause */:
-                        case 282 /* DefaultClause */:
+                        case 284 /* CaseClause */:
+                        case 285 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 244 /* TryStatement */:
+                        case 247 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 243 /* ThrowStatement */:
+                        case 246 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 263 /* ExportAssignment */:
+                        case 266 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 257 /* ImportEqualsDeclaration */:
+                        case 260 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 258 /* ImportDeclaration */:
+                        case 261 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 264 /* ExportDeclaration */:
+                        case 267 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 253 /* ModuleDeclaration */:
+                        case 256 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 249 /* ClassDeclaration */:
-                        case 252 /* EnumDeclaration */:
-                        case 288 /* EnumMember */:
-                        case 195 /* BindingElement */:
+                        case 252 /* ClassDeclaration */:
+                        case 255 /* EnumDeclaration */:
+                        case 291 /* EnumMember */:
+                        case 198 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 240 /* WithStatement */:
+                        case 243 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 160 /* Decorator */:
+                        case 161 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 193 /* ObjectBindingPattern */:
-                        case 194 /* ArrayBindingPattern */:
+                        case 196 /* ObjectBindingPattern */:
+                        case 197 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 250 /* InterfaceDeclaration */:
-                        case 251 /* TypeAliasDeclaration */:
+                        case 253 /* InterfaceDeclaration */:
+                        case 254 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -145222,7 +148477,7 @@ var ts;
                         case 82 /* CatchKeyword */:
                         case 95 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 155 /* OfKeyword */:
+                        case 156 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -145235,13 +148490,13 @@ var ts;
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
                             if ((node.kind === 78 /* Identifier */ ||
-                                node.kind === 217 /* SpreadElement */ ||
-                                node.kind === 285 /* PropertyAssignment */ ||
-                                node.kind === 286 /* ShorthandPropertyAssignment */) &&
+                                node.kind === 220 /* SpreadElement */ ||
+                                node.kind === 288 /* PropertyAssignment */ ||
+                                node.kind === 289 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 213 /* BinaryExpression */) {
+                            if (node.kind === 216 /* 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
@@ -145263,22 +148518,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 232 /* DoStatement */:
+                                    case 235 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 160 /* Decorator */:
+                                    case 161 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 234 /* ForStatement */:
-                                    case 236 /* ForOfStatement */:
+                                    case 237 /* ForStatement */:
+                                    case 239 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 213 /* BinaryExpression */:
+                                    case 216 /* 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 206 /* ArrowFunction */:
+                                    case 209 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -145287,21 +148542,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 285 /* PropertyAssignment */:
+                                case 288 /* 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 203 /* TypeAssertionExpression */:
+                                case 206 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 246 /* VariableDeclaration */:
-                                case 159 /* Parameter */: {
+                                case 249 /* VariableDeclaration */:
+                                case 160 /* 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)) {
@@ -145309,7 +148564,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 213 /* BinaryExpression */: {
+                                case 216 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -145339,7 +148594,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 235 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 238 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -145351,7 +148606,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasSyntacticModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 236 /* ForOfStatement */) {
+                        parent.parent.kind === 239 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -145392,7 +148647,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasSyntacticModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 249 /* ClassDeclaration */ && functionDeclaration.kind !== 165 /* Constructor */);
+                        (functionDeclaration.parent.kind === 252 /* ClassDeclaration */ && functionDeclaration.kind !== 166 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -145415,26 +148670,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 253 /* ModuleDeclaration */:
+                        case 256 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
                         // falls through
-                        case 233 /* WhileStatement */:
-                        case 231 /* IfStatement */:
-                        case 235 /* ForInStatement */:
+                        case 236 /* WhileStatement */:
+                        case 234 /* IfStatement */:
+                        case 238 /* 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 234 /* ForStatement */:
-                        case 236 /* ForOfStatement */:
+                        case 237 /* ForStatement */:
+                        case 239 /* 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 === 247 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 250 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -145459,21 +148714,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 219 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 222 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 195 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 198 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 194 /* ArrayBindingPattern */ && node.kind !== 193 /* ObjectBindingPattern */);
-                    var elements = node.kind === 196 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 219 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 197 /* ArrayBindingPattern */ && node.kind !== 196 /* ObjectBindingPattern */);
+                    var elements = node.kind === 199 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 222 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -145481,18 +148736,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 === 213 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 216 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 252 /* EnumDeclaration */:
+                        case 255 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 249 /* ClassDeclaration */:
+                        case 252 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 255 /* CaseBlock */:
+                        case 258 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -145500,25 +148755,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 254 /* ModuleBlock */:
+                        case 257 /* 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 252 /* EnumDeclaration */:
-                        case 249 /* ClassDeclaration */:
+                        case 255 /* EnumDeclaration */:
+                        case 252 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 227 /* Block */:
+                        case 230 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 284 /* CatchClause */:
+                        case 287 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 255 /* CaseBlock */:
+                        case 258 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -145526,7 +148781,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 193 /* ObjectBindingPattern */:
+                        case 196 /* 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);
@@ -145542,7 +148797,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 194 /* ArrayBindingPattern */:
+                        case 197 /* 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);
@@ -145557,12 +148812,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 232 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 200 /* CallExpression */ ||
-                        node.parent.kind === 201 /* NewExpression */) {
+                    if (node.parent.kind === 235 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 203 /* CallExpression */ ||
+                        node.parent.kind === 204 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 204 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 207 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -145571,21 +148826,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 205 /* FunctionExpression */:
-                        case 248 /* FunctionDeclaration */:
-                        case 206 /* ArrowFunction */:
-                        case 164 /* MethodDeclaration */:
-                        case 163 /* MethodSignature */:
-                        case 166 /* GetAccessor */:
-                        case 167 /* SetAccessor */:
-                        case 165 /* Constructor */:
-                        case 233 /* WhileStatement */:
-                        case 232 /* DoStatement */:
-                        case 234 /* ForStatement */:
-                        case 236 /* ForOfStatement */:
-                        case 200 /* CallExpression */:
-                        case 201 /* NewExpression */:
-                        case 204 /* ParenthesizedExpression */:
+                        case 208 /* FunctionExpression */:
+                        case 251 /* FunctionDeclaration */:
+                        case 209 /* ArrowFunction */:
+                        case 165 /* MethodDeclaration */:
+                        case 164 /* MethodSignature */:
+                        case 167 /* GetAccessor */:
+                        case 168 /* SetAccessor */:
+                        case 166 /* Constructor */:
+                        case 236 /* WhileStatement */:
+                        case 235 /* DoStatement */:
+                        case 237 /* ForStatement */:
+                        case 239 /* ForOfStatement */:
+                        case 203 /* CallExpression */:
+                        case 204 /* NewExpression */:
+                        case 207 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -145595,20 +148850,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 285 /* PropertyAssignment */ ||
-                        node.parent.kind === 159 /* Parameter */) {
+                        node.parent.kind === 288 /* PropertyAssignment */ ||
+                        node.parent.kind === 160 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 203 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 206 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 232 /* DoStatement */) {
+                    if (node.parent.kind === 235 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -145616,7 +148871,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 236 /* ForOfStatement */) {
+                    if (node.parent.kind === 239 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -147191,7 +150446,7 @@ var ts;
         }
         else {
             type = operatorOrType;
-            operator = 137 /* KeyOfKeyword */;
+            operator = 138 /* KeyOfKeyword */;
         }
         return ts.factory.createTypeOperatorNode(operator, type);
     }, factoryDeprecation);
@@ -147369,7 +150624,7 @@ var ts;
     ts.createNode = ts.Debug.deprecate(function createNode(kind, pos, end) {
         if (pos === void 0) { pos = 0; }
         if (end === void 0) { end = 0; }
-        return ts.setTextRangePosEnd(kind === 294 /* SourceFile */ ? ts.parseBaseNodeFactory.createBaseSourceFileNode(kind) :
+        return ts.setTextRangePosEnd(kind === 297 /* SourceFile */ ? ts.parseBaseNodeFactory.createBaseSourceFileNode(kind) :
             kind === 78 /* Identifier */ ? ts.parseBaseNodeFactory.createBaseIdentifierNode(kind) :
                 kind === 79 /* PrivateIdentifier */ ? ts.parseBaseNodeFactory.createBasePrivateIdentifierNode(kind) :
                     !ts.isNodeKind(kind) ? ts.parseBaseNodeFactory.createBaseTokenNode(kind) :
@@ -147398,7 +150653,7 @@ var ts;
     // #region Renamed node Tests
     /** @deprecated Use `isTypeAssertionExpression` instead. */
     ts.isTypeAssertion = ts.Debug.deprecate(function isTypeAssertion(node) {
-        return node.kind === 203 /* TypeAssertionExpression */;
+        return node.kind === 206 /* TypeAssertionExpression */;
     }, {
         since: "4.0",
         warnAfter: "4.1",
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 67d6be6f7be8..dfe9c220e00a 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index b5fb43a2f156..f94d17d3f62f 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { Schema as ApplicationOptions, Style } from '../application/schema';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -88,7 +88,7 @@ describe('Universal Schematic', () => {
     const filePath = '/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     // tslint:disable-next-line: no-any
-    const contents = parseJson(tree.readContent(filePath).toString(), JsonParseMode.Loose) as any;
+    const contents = parseJson(tree.readContent(filePath).toString()) as any;
     expect(contents).toEqual({
       extends: './tsconfig.app.json',
       compilerOptions: {
@@ -114,7 +114,7 @@ describe('Universal Schematic', () => {
     const filePath = '/projects/bar/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     // tslint:disable-next-line: no-any
-    const contents = parseJson(tree.readContent(filePath).toString(), JsonParseMode.Loose) as any;
+    const contents = parseJson(tree.readContent(filePath).toString()) as any;
     expect(contents).toEqual({
       extends: './tsconfig.app.json',
       compilerOptions: {
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index ec405b1ce680..b220deb8f020 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -39,7 +39,7 @@
       "default": "AppServerModule"
     },
     "skipInstall": {
-      "description": "When true, does not install packages for dependencies.",
+      "description": "Do not install packages for dependencies.",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 855160cd53d1..c986f037ea6c 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -1,10 +1,11 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change, InsertChange, NoopChange } from './change';
 
@@ -231,18 +232,6 @@ export function insertAfterLastOccurrence(nodes: ts.Node[],
   return new InsertChange(file, lastItemPosition, toInsert);
 }
 
-
-export 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;
-  }
-}
-
-
 function _angularImportsFromNode(node: ts.ImportDeclaration,
                                  _sourceFile: ts.SourceFile): {[name: string]: string} {
   const ms = node.moduleSpecifier;
@@ -336,38 +325,6 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
     .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);
 }
 
-function findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration|undefined {
-  if (ts.isClassDeclaration(node)) {
-    return node;
-  }
-
-  return node.parent && findClassDeclarationParent(node.parent);
-}
-
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-export function getFirstNgModuleName(source: ts.SourceFile): string|undefined {
-  // First, find the @NgModule decorators.
-  const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-  if (ngModulesMetadata.length === 0) {
-    return undefined;
-  }
-
-  // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule
-  // metadata.
-  const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);
-  if (!moduleClass || !moduleClass.name) {
-    return undefined;
-  }
-
-  // Get the class name of the module ClassDeclaration.
-  return moduleClass.name.text;
-}
-
 export function getMetadataField(
   node: ts.ObjectLiteralExpression,
   metadataField: string,
@@ -377,8 +334,7 @@ export function getMetadataField(
     // Filter out every fields that's not "metadataField". Also handles string literals
     // (but not expressions).
     .filter(({ name }) => {
-      return (ts.isIdentifier(name) || ts.isStringLiteral(name))
-        && name.getText() === metadataField;
+      return (ts.isIdentifier(name) || ts.isStringLiteral(name)) && name.text === metadataField;
     });
 }
 
@@ -403,10 +359,6 @@ export function addSymbolToNgModuleMetadata(
     metadataField,
   );
 
-  // Get the last node of the array literal.
-  if (!matchingProperties) {
-    return [];
-  }
   if (matchingProperties.length == 0) {
     // We haven't found the field in the metadata declaration. Insert a new field.
     const expr = node as ts.ObjectLiteralExpression;
@@ -414,15 +366,16 @@ export function addSymbolToNgModuleMetadata(
     let toInsert: string;
     if (expr.properties.length == 0) {
       position = expr.getEnd() - 1;
-      toInsert = `  ${metadataField}: [${symbolName}]\n`;
+      toInsert = `\n  ${metadataField}: [\n${tags.indentBy(4)`${symbolName}`}\n  ]\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);
-      const matches = text.match(/^\r?\n\s*/);
-      if (matches && matches.length > 0) {
-        toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;
+      const matches = text.match(/^(\r?\n)(\s*)/);
+      if (matches) {
+        toInsert = `,${matches[0]}${metadataField}: [${matches[1]}` +
+            `${tags.indentBy(matches[2].length + 2)`${symbolName}`}${matches[0]}]`;
       } else {
         toInsert = `, ${metadataField}: [${symbolName}]`;
       }
@@ -451,17 +404,10 @@ export function addSymbolToNgModuleMetadata(
     node = arrLiteral.elements;
   }
 
-  if (!node) {
-    // tslint:disable-next-line: no-console
-    console.error('No app module found. Please add your new class to your component.');
-
-    return [];
-  }
-
   if (Array.isArray(node)) {
     const nodeArray = node as {} as Array<ts.Node>;
-    const symbolsArray = nodeArray.map(node => node.getText());
-    if (symbolsArray.includes(symbolName)) {
+    const symbolsArray = nodeArray.map(node => tags.oneLine`${node.getText()}`);
+    if (symbolsArray.includes(tags.oneLine`${symbolName}`)) {
       return [];
     }
 
@@ -470,31 +416,16 @@ export function addSymbolToNgModuleMetadata(
 
   let toInsert: string;
   let position = node.getEnd();
-  if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {
-    // We haven't found the field in the metadata declaration. Insert a new
-    // field.
-    const expr = node as ts.ObjectLiteralExpression;
-    if (expr.properties.length == 0) {
-      position = expr.getEnd() - 1;
-      toInsert = `  ${symbolName}\n`;
-    } else {
-      // 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]}${symbolName}`;
-      } else {
-        toInsert = `, ${symbolName}`;
-      }
-    }
-  } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
+  if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
     // We found the field but it's empty. Insert it just before the `]`.
     position--;
-    toInsert = `${symbolName}`;
+    toInsert = `\n${tags.indentBy(4)`${symbolName}`}\n  `;
   } else {
     // 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}`;
+    const matches = text.match(/^(\r?\n)(\s*)/);
+    if (matches) {
+      toInsert = `,${matches[1]}${tags.indentBy(matches[2].length)`${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 2a960fdd3f84..38336eefd7e1 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -1,7 +1,7 @@
 
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -70,7 +70,7 @@ describe('ast utils', () => {
     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\]/);
+    expect(output).toMatch(/exports: \[\n(\s*)  FooComponent\n\1\]/);
   });
 
   it('should add export to module if not indented', () => {
@@ -79,7 +79,7 @@ describe('ast utils', () => {
     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\]/);
+    expect(output).toMatch(/exports: \[\n(\s*)  FooComponent\n\1\]/);
   });
 
   it('should add declarations to module if not indented', () => {
@@ -91,13 +91,36 @@ describe('ast utils', () => {
     expect(output).toMatch(/declarations: \[\nAppComponent,\nFooComponent\n\]/);
   });
 
+  it('should add declarations to module when PropertyAssignment is StringLiteral', () => {
+    moduleContent = tags.stripIndents`
+    import { BrowserModule } from '@angular/platform-browser';
+    import { NgModule } from '@angular/core';
+    import { AppComponent } from './app.component';
+
+    @NgModule({
+      "declarations": [
+        AppComponent
+      ],
+      "imports": [
+        BrowserModule
+      ],
+      "providers": [],
+      "bootstrap": [AppComponent]
+    })`;
+    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');
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: [\s\S]+,\n\s+HelloWorld\n\s+\]/m);
+    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*)  HelloWorld\n\1\]/);
   });
 
   it('should add metadata (comma)', () => {
@@ -122,7 +145,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: [\s\S]+,\n\s+HelloWorld,\n\s+\]/m);
+    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*)  HelloWorld,\n\1\]/);
   });
 
   it('should add metadata (missing)', () => {
@@ -144,7 +167,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[HelloWorld]\r?\n/m);
+    expect(output).toMatch(/imports: \[\n(\s*)  HelloWorld\n\1\]/);
   });
 
   it('should add metadata (empty)', () => {
@@ -167,7 +190,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[HelloWorld],\r?\n/m);
+    expect(output).toMatch(/imports: \[\n(\s*)  HelloWorld\n\1\],\n/);
   });
 
   it(`should handle NgModule with newline after '@'`, () => {
diff --git a/packages/schematics/angular/utility/change.ts b/packages/schematics/angular/utility/change.ts
index f1ddcc964a33..64a71b900fc8 100644
--- a/packages/schematics/angular/utility/change.ts
+++ b/packages/schematics/angular/utility/change.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/dependencies.ts b/packages/schematics/angular/utility/dependencies.ts
index 2a2a86191557..4591e9968fec 100644
--- a/packages/schematics/angular/utility/dependencies.ts
+++ b/packages/schematics/angular/utility/dependencies.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/dependencies_spec.ts b/packages/schematics/angular/utility/dependencies_spec.ts
index 61a95a765fc3..80fdba530c78 100644
--- a/packages/schematics/angular/utility/dependencies_spec.ts
+++ b/packages/schematics/angular/utility/dependencies_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 9d1866dc1ae6..8e4d80f0d597 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index c7e44f594836..65e9955c47fb 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/json-file.ts b/packages/schematics/angular/utility/json-file.ts
index e82d6899f096..5aebc493a727 100644
--- a/packages/schematics/angular/utility/json-file.ts
+++ b/packages/schematics/angular/utility/json-file.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -30,13 +30,13 @@ export class JSONFile {
   }
 
   private _jsonAst: Node | undefined;
-  private get JsonAst(): Node {
+  private get JsonAst(): Node | undefined {
     if (this._jsonAst) {
       return this._jsonAst;
     }
 
     const errors: ParseError[] = [];
-    this._jsonAst = parseTree(this.content, errors);
+    this._jsonAst = parseTree(this.content, errors, { allowTrailingComma: true });
     if (errors.length) {
       const { error, offset } = errors[0];
       throw new Error(`Failed to parse "${this.path}" as JSON AST Object. ${printParseErrorCode(error)} at location: ${offset}.`);
@@ -46,11 +46,16 @@ export class JSONFile {
   }
 
   get(jsonPath: JSONPath): unknown {
+    const jsonAstNode = this.JsonAst;
+    if (!jsonAstNode) {
+      return undefined;
+    }
+
     if (jsonPath.length === 0) {
-      return getNodeValue(this.JsonAst);
+      return getNodeValue(jsonAstNode);
     }
 
-    const node = findNodeAtLocation(this.JsonAst, jsonPath);
+    const node = findNodeAtLocation(jsonAstNode, jsonPath);
 
     return node === undefined ? undefined : getNodeValue(node);
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 3f46a7e7c061..db3ecc6103f0 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,19 +8,19 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~11.0.0-next.6',
+  Angular: '~11.2.14',
   RxJs: '~6.6.0',
-  ZoneJs: '~0.10.2',
-  TypeScript: '~4.0.2',
+  ZoneJs: '~0.11.3',
+  TypeScript: '~4.1.5',
   TsLib: '^2.0.0',
 
   // The versions below must be manually updated when making a new devkit release.
   // For our e2e tests, these versions must match the latest tag present on the branch.
   // During RC periods they will not match the latest RC until there's a new git tag, and
   // should not be updated.
-  DevkitBuildAngular: '~0.1100.0-next.7',
-  DevkitBuildNgPackagr: '~0.1100.0-next.7',
-  DevkitBuildWebpack: '~0.1100.0-next.7',
+  DevkitBuildAngular: '~0.1102.18',
+  DevkitBuildNgPackagr: '~0.1102.18',
+  DevkitBuildWebpack: '~0.1102.18',
 
-  ngPackagr: '^11.0.0-next.0',
+  ngPackagr: '^11.0.0',
 };
diff --git a/packages/schematics/angular/utility/lint-fix.ts b/packages/schematics/angular/utility/lint-fix.ts
index f794bf681fd2..2a1dd3139c1d 100644
--- a/packages/schematics/angular/utility/lint-fix.ts
+++ b/packages/schematics/angular/utility/lint-fix.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/ng-ast-utils.ts b/packages/schematics/angular/utility/ng-ast-utils.ts
index 9462d3b8e697..c8895804e509 100644
--- a/packages/schematics/angular/utility/ng-ast-utils.ts
+++ b/packages/schematics/angular/utility/ng-ast-utils.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/parse-name.ts b/packages/schematics/angular/utility/parse-name.ts
index cac57b08680b..1de912bba515 100644
--- a/packages/schematics/angular/utility/parse-name.ts
+++ b/packages/schematics/angular/utility/parse-name.ts
@@ -1,7 +1,7 @@
 
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/parse-name_spec.ts b/packages/schematics/angular/utility/parse-name_spec.ts
index 3c969d6ca9df..b1c2ac6b272d 100644
--- a/packages/schematics/angular/utility/parse-name_spec.ts
+++ b/packages/schematics/angular/utility/parse-name_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/paths.ts b/packages/schematics/angular/utility/paths.ts
index 35729a641713..dffa9e841d04 100644
--- a/packages/schematics/angular/utility/paths.ts
+++ b/packages/schematics/angular/utility/paths.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/paths_spec.ts b/packages/schematics/angular/utility/paths_spec.ts
index 1cdc3e031631..e3a483defc8d 100644
--- a/packages/schematics/angular/utility/paths_spec.ts
+++ b/packages/schematics/angular/utility/paths_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/project-targets.ts b/packages/schematics/angular/utility/project-targets.ts
index e99293f10e83..7f4b7ba8c647 100644
--- a/packages/schematics/angular/utility/project-targets.ts
+++ b/packages/schematics/angular/utility/project-targets.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/test/create-app-module.ts b/packages/schematics/angular/utility/test/create-app-module.ts
index 5847d5cb109e..e7d46b3a2628 100644
--- a/packages/schematics/angular/utility/test/create-app-module.ts
+++ b/packages/schematics/angular/utility/test/create-app-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/test/get-file-content.ts b/packages/schematics/angular/utility/test/get-file-content.ts
index 0e9dfe82c3c5..2b9a123a236c 100644
--- a/packages/schematics/angular/utility/test/get-file-content.ts
+++ b/packages/schematics/angular/utility/test/get-file-content.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/test/index.ts b/packages/schematics/angular/utility/test/index.ts
index afb74bfa8b84..a05d72b679b3 100644
--- a/packages/schematics/angular/utility/test/index.ts
+++ b/packages/schematics/angular/utility/test/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/validation.ts b/packages/schematics/angular/utility/validation.ts
index 923b819df9da..876f9b830c40 100644
--- a/packages/schematics/angular/utility/validation.ts
+++ b/packages/schematics/angular/utility/validation.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 28cecea39e5f..1f7fdaffdace 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/utility/workspace.ts b/packages/schematics/angular/utility/workspace.ts
index f916871d0e41..4d77b4ac77a9 100644
--- a/packages/schematics/angular/utility/workspace.ts
+++ b/packages/schematics/angular/utility/workspace.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 1ebf4942355b..396a155dacee 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 066be368f57e..3b0cd2cf439c 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as WebWorkerOptions } from './schema';
@@ -60,7 +60,7 @@ describe('Web Worker Schematic', () => {
     expect(tree.exists(path)).toEqual(true);
 
     // tslint:disable-next-line: no-any
-    const { compilerOptions } = parseJson(tree.readContent(path).toString(), JsonParseMode.Loose) as any;
+    const { compilerOptions } = parseJson(tree.readContent(path).toString()) as any;
     expect(compilerOptions.outDir).toBe('../../out-tsc/worker');
   });
 
@@ -125,7 +125,7 @@ describe('Web Worker Schematic', () => {
     expect(tree.exists(path)).toEqual(true);
 
     // tslint:disable-next-line: no-any
-    const { compilerOptions } = parseJson(tree.readContent(path).toString(), JsonParseMode.Loose) as any;
+    const { compilerOptions } = parseJson(tree.readContent(path).toString()) as any;
     expect(compilerOptions.outDir).toBe('./out-tsc/worker');
   });
 
diff --git a/packages/schematics/angular/workspace/files/README.md.template b/packages/schematics/angular/workspace/files/README.md.template
index 42a51babbb5b..25d6cf773051 100644
--- a/packages/schematics/angular/workspace/files/README.md.template
+++ b/packages/schematics/angular/workspace/files/README.md.template
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 
 ## 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).
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 9e7825f8bcb5..7097c08df161 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -4,9 +4,9 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build"<% if (!minimal) { %>,
     "test": "ng test",
-    "lint": "ng lint"
+    "lint": "ng lint"<% } %>
   },
   "private": true,
   "dependencies": {
@@ -25,19 +25,19 @@
   "devDependencies": {
     "@angular/cli": "<%= '~' + version %>",
     "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!minimal) { %>
-    "@types/jasmine": "~3.5.0",<% } %>
+    "@types/jasmine": "~3.6.0",<% } %>
     "@types/node": "^12.11.1",<% if (!minimal) { %>
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.2.0",
+    "karma": "~6.1.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",<% } %>
+    "karma-jasmine-html-reporter": "~1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
-    "tslint": "~6.1.0",
+    "tslint": "~6.1.0",<% } %>
     "typescript": "<%= latestVersions.TypeScript %>"
   }
 }
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index 009cf2936e0f..6e8c9fa96baf 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -20,10 +20,11 @@
       "es2018",
       "dom"
     ]
-  }<% if (strict) { %>,
+  },
   "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false<% if (strict) { %>,
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }<% } %>
+    "strictTemplates": true<% } %>
+  }
 }
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
index 05282267baf5..8b79f822495c 100644
--- a/packages/schematics/angular/workspace/index.ts
+++ b/packages/schematics/angular/workspace/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts
index 5d8f7c97a705..e5c3a46b5f3c 100644
--- a/packages/schematics/angular/workspace/index_spec.ts
+++ b/packages/schematics/angular/workspace/index_spec.ts
@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 } from '@angular-devkit/core';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
+import { parse as parseJson } from 'jsonc-parser';
 import { latestVersions } from '../utility/latest-versions';
 import { Schema as WorkspaceOptions } from './schema';
 
@@ -73,20 +73,28 @@ describe('Workspace Schematic', () => {
     expect(files).not.toContain('/.editorconfig');
   });
 
+  it('should set the `enableI18nLegacyMessageIdFormat` Angular compiler option', async () => {
+    const tree = await schematicRunner.runSchematicAsync('workspace', defaultOptions).toPromise();
+    const { angularCompilerOptions } =
+      // tslint:disable-next-line: no-any
+      parseJson(tree.readContent('tsconfig.json').toString()) as any;
+    expect(angularCompilerOptions.enableI18nLegacyMessageIdFormat).toBe(false);
+  });
+
   it('should not add strict compiler options when false', async () => {
     const tree = await schematicRunner.runSchematicAsync('workspace', { ...defaultOptions, strict: false }).toPromise();
     const { compilerOptions, angularCompilerOptions } =
       // tslint:disable-next-line: no-any
-      parseJson(tree.readContent('tsconfig.json').toString(), JsonParseMode.Loose) as any;
+      parseJson(tree.readContent('tsconfig.json').toString()) as any;
     expect(compilerOptions.strict).toBeUndefined();
-    expect(angularCompilerOptions).toBeUndefined();
+    expect(Object.keys(angularCompilerOptions).filter(option => option.startsWith('strict'))).toEqual([]);
   });
 
   it('should add strict compiler options when true', async () => {
     const tree = await schematicRunner.runSchematicAsync('workspace', { ...defaultOptions, strict: true }).toPromise();
     const { compilerOptions, angularCompilerOptions } =
       // tslint:disable-next-line: no-any
-      parseJson(tree.readContent('tsconfig.json').toString(), JsonParseMode.Loose) as any;
+      parseJson(tree.readContent('tsconfig.json').toString()) as any;
     expect(compilerOptions.strict).toBe(true);
     expect(angularCompilerOptions.strictTemplates).toBe(true);
   });
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index b7878b45b586..543cec4a676d 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -27,13 +27,13 @@
       }
     },
     "minimal": {
-      "description": "When true, creates a workspace without any testing frameworks. (Use for learning purposes only.)",
+      "description": "Create a workspace without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false,
       "x-user-analytics": 14
     },
     "strict": {
-      "description": "Creates a workspace with stricter type checking options. This setting helps improve maintainability and catch bugs ahead of time. For more information, see https://angular.io/strict",
+      "description": "Create a workspace with stricter type checking options. This setting helps improve maintainability and catch bugs ahead of time. For more information, see https://angular.io/strict",
       "type": "boolean",
       "default": false,
       "x-user-analytics": 7
diff --git a/packages/schematics/schematics/blank/factory.ts b/packages/schematics/schematics/blank/factory.ts
index 996b0522e217..def925df159d 100644
--- a/packages/schematics/schematics/blank/factory.ts
+++ b/packages/schematics/schematics/blank/factory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/schematics/blank/project-files/package.json.template b/packages/schematics/schematics/blank/project-files/package.json.template
index 9ed40ad2502c..ef854f034ffe 100644
--- a/packages/schematics/schematics/blank/project-files/package.json.template
+++ b/packages/schematics/schematics/blank/project-files/package.json.template
@@ -15,7 +15,7 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.0.2"
+    "typescript": "~4.1.2"
   },
   "devDependencies": {
     "@types/node": "^12.11.1",
diff --git a/packages/schematics/schematics/schematic/factory.ts b/packages/schematics/schematics/schematic/factory.ts
index 46fedd3a11d6..2f5dab5a3541 100644
--- a/packages/schematics/schematics/schematic/factory.ts
+++ b/packages/schematics/schematics/schematic/factory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 92df5b7d2f25..04b9c8882467 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -15,11 +15,11 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.0.2"
+    "typescript": "~4.1.5"
   },
   "devDependencies": {
     "@types/node": "^12.11.1",
-    "@types/jasmine": "~3.5.0",
+    "@types/jasmine": "~3.6.0",
     "jasmine": "^3.5.0"
   }
 }
diff --git a/packages/schematics/update/BUILD.bazel b/packages/schematics/update/BUILD.bazel
index 5a5f3ba4b350..0a02e723e62d 100644
--- a/packages/schematics/update/BUILD.bazel
+++ b/packages/schematics/update/BUILD.bazel
@@ -102,6 +102,7 @@ jasmine_node_test(
 pkg_npm(
     name = "npm_package",
     deps = [
+        "README.md",
         ":update",
     ],
 )
diff --git a/packages/schematics/update/README.md b/packages/schematics/update/README.md
new file mode 100644
index 000000000000..9ab2de97276e
--- /dev/null
+++ b/packages/schematics/update/README.md
@@ -0,0 +1,4 @@
+# `@schematics/update`
+
+This package is **deprecated** and will not be updated beyond Angular v11 (`0.1102.x`). It should no
+longer be used.
diff --git a/packages/schematics/update/migrate/index.ts b/packages/schematics/update/migrate/index.ts
index 3f3529575d2c..e8412ec7d76b 100644
--- a/packages/schematics/update/migrate/index.ts
+++ b/packages/schematics/update/migrate/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/update/migrate/index_spec.ts b/packages/schematics/update/migrate/index_spec.ts
index 8e2b197ca753..fda3e9f535ce 100644
--- a/packages/schematics/update/migrate/index_spec.ts
+++ b/packages/schematics/update/migrate/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/update/migrate/test/t1.ts b/packages/schematics/update/migrate/test/t1.ts
index 9122c812c269..a7b89b419cd4 100644
--- a/packages/schematics/update/migrate/test/t1.ts
+++ b/packages/schematics/update/migrate/test/t1.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 2cc170a37d2b..8d0b6f8f0e5a 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,10 +14,10 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
-    "ini": "1.3.5",
+    "ini": "2.0.0",
     "npm-package-arg": "^8.0.0",
-    "pacote": "9.5.12",
-    "semver": "7.3.2",
+    "pacote": "11.2.4",
+    "semver": "7.3.4",
     "semver-intersect": "1.4.0"
   }
 }
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index ccb115698603..596d3c454d87 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -172,6 +172,19 @@ function _validateReversePeerDependencies(
         continue;
       }
 
+      // Ignore peerDependency mismatches for these packages.
+      // They are deprecated and removed via a migration.
+      const ignoredPackages = [
+        'codelyzer',
+        '@schematics/update',
+        '@angular-devkit/build-ng-packagr',
+        'tsickle',
+      ];
+
+      if (ignoredPackages.includes(installed)) {
+        continue;
+      }
+
       // Override the peer version range if it's known as a compatible.
       const extendedRange = _updatePeerVersion(infoMap, peer, range);
 
@@ -453,10 +466,39 @@ function _usageMessage(
   const packageGroups = new Map<string, string>();
   const packagesToUpdate = [...infoMap.entries()]
     .map(([name, info]) => {
-      const tag = options.next
-        ? (info.npmPackageJson['dist-tags']['next'] ? 'next' : 'latest') : 'latest';
-      const version = info.npmPackageJson['dist-tags'][tag];
-      const target = info.npmPackageJson.versions[version];
+      let tag = options.next
+        ? info.npmPackageJson['dist-tags']['next']
+          ? 'next'
+          : 'latest'
+        : 'latest';
+      let version = info.npmPackageJson['dist-tags'][tag];
+      let target = info.npmPackageJson.versions[version];
+
+      const versionDiff = semver.diff(info.installed.version, version);
+      if (
+        versionDiff !== 'patch' &&
+        versionDiff !== 'minor' &&
+        /^@(?:angular|nguniversal)\//.test(name)
+      ) {
+        const installedMajorVersion = semver.parse(info.installed.version)?.major;
+        const toInstallMajorVersion = semver.parse(version)?.major;
+        if (
+          installedMajorVersion !== undefined &&
+          toInstallMajorVersion !== undefined &&
+          installedMajorVersion < toInstallMajorVersion - 1
+        ) {
+          const nextMajorVersion = `${installedMajorVersion + 1}.`;
+          const nextMajorVersions = Object.keys(info.npmPackageJson.versions)
+            .filter((v) => v.startsWith(nextMajorVersion))
+            .sort((a, b) => (a > b ? -1 : 1));
+
+          if (nextMajorVersions.length) {
+            version = nextMajorVersions[0];
+            target = info.npmPackageJson.versions[version];
+            tag = '';
+          }
+        }
+      }
 
       return {
         name,
@@ -490,7 +532,9 @@ function _usageMessage(
       }
 
       let command = `ng update ${name}`;
-      if (tag == 'next') {
+      if (!tag) {
+        command += `@${semver.parse(version)?.major || version}`;
+      } else if (tag == 'next') {
         command += ' --next';
       }
 
@@ -532,7 +576,7 @@ function _usageMessage(
 
   logger.info(
     `\nThere might be additional packages which don't provide 'ng update' capabilities that are outdated.\n`
-    + `You can update the addition packages by running the update command of your package manager.`,
+    + `You can update the additional packages by running the update command of your package manager.`,
   );
 
   return;
@@ -635,7 +679,7 @@ function _buildPackageList(
   const commandLinePackages =
     (options.packages && options.packages.length > 0)
     ? options.packages
-    : (options.all ? projectDeps.keys() : []);
+    : [];
 
   for (const pkg of commandLinePackages) {
     // Split the version asked on command line.
@@ -653,26 +697,6 @@ function _buildPackageList(
       continue;
     }
 
-    // Verify that people have an actual version in the package.json, otherwise (label or URL or
-    // gist or ...) we don't update it.
-    if (
-      version.startsWith('http:')  // HTTP
-      || version.startsWith('file:')  // Local folder
-      || version.startsWith('git:')  // GIT url
-      || version.match(/^\w{1,100}\/\w{1,100}/)  // GitHub's "user/repo"
-      || version.match(/^(?:\.{0,2}\/)\w{1,100}/)  // Local folder, maybe relative.
-    ) {
-      // We only do that for --all. Otherwise we have the installed version and the user specified
-      // it on the command line.
-      if (options.all) {
-        logger.warn(
-          `Package ${JSON.stringify(npmName)} has a custom version: `
-          + `${JSON.stringify(version)}. Skipping.`,
-        );
-        continue;
-      }
-    }
-
     packages.set(npmName, (maybeVersion || (options.next ? 'next' : 'latest')) as VersionRange);
   }
 
@@ -865,10 +889,9 @@ export default function(options: UpdateSchema): Rule {
       try {
         return isPkgFromRegistry(name, specifier);
       } catch {
-        // Abort on failure because package.json is malformed.
-        throw new SchematicsException(
-          `Failed to parse dependency "${name}" with specifier "${specifier}"`
-              + ` from package.json. Is the specifier malformed?`);
+        logger.warn(`Package ${name} was not found on the registry. Skipping.`);
+
+        return false;
       }
     }));
     const packages = _buildPackageList(options, npmDeps, logger);
@@ -891,14 +914,9 @@ export default function(options: UpdateSchema): Rule {
         // private one, but it's rare enough.
         if (!npmPackageJson.name) {
           if (npmPackageJson.requestedName && packages.has(npmPackageJson.requestedName)) {
-            if (options.all) {
-              logger.warn(`Package ${JSON.stringify(npmPackageJson.requestedName)} was not `
-                + 'found on the registry. Skipping.');
-            } else {
-              throw new SchematicsException(
-                `Package ${JSON.stringify(npmPackageJson.requestedName)} was not found on the `
-                + 'registry. Cannot continue as this may be an error.');
-            }
+            throw new SchematicsException(
+              `Package ${JSON.stringify(npmPackageJson.requestedName)} was not found on the `
+              + 'registry. Cannot continue as this may be an error.');
           }
         } else {
           // If a name is present, it is assumed to be fully populated
diff --git a/packages/schematics/update/update/index_spec.ts b/packages/schematics/update/update/index_spec.ts
index dcbe57590025..de1948b564e4 100644
--- a/packages/schematics/update/update/index_spec.ts
+++ b/packages/schematics/update/update/index_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -8,10 +8,9 @@
 // tslint:disable:no-big-function
 
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { HostTree, SchematicsException } from '@angular-devkit/schematics';
+import { HostTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { EMPTY } from 'rxjs'; // tslint:disable-line: no-implicit-dependencies
-import { catchError, map } from 'rxjs/operators'; // tslint:disable-line: no-implicit-dependencies
+import { map } from 'rxjs/operators'; // tslint:disable-line: no-implicit-dependencies
 import * as semver from 'semver';
 import { angularMajorCompatGuarantee } from './index';
 
@@ -54,28 +53,6 @@ describe('@schematics/update', () => {
     appTree = new UnitTestTree(new HostTree(host));
   });
 
-  it('updates package.json', 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('update', { all: true }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe('1.1.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'node-package',
-            options: jasmine.objectContaining({
-              command: 'install',
-            }),
-          },
-        ]);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 45000);
-
   it('ignores dependencies not hosted on the NPM registry', done => {
     const tree = new UnitTestTree(new HostTree(new virtualFs.test.TestHost({
       '/package.json': `{
@@ -86,7 +63,7 @@ describe('@schematics/update', () => {
       }`,
     })));
 
-    schematicRunner.runSchematicAsync('update', { all: true }, tree).pipe(
+    schematicRunner.runSchematicAsync('update', undefined, tree).pipe(
       map(t => {
         const packageJson = JSON.parse(t.readContent('/package.json'));
         expect(packageJson['dependencies']['@angular-devkit-tests/update-base'])
@@ -95,84 +72,24 @@ describe('@schematics/update', () => {
     ).toPromise().then(done, done.fail);
   }, 45000);
 
-  it('emits SchematicsException when given an invalid dependency', done => {
+  it('should not error with yarn 2.0 protocols', async () => {
     const tree = new UnitTestTree(new HostTree(new virtualFs.test.TestHost({
       '/package.json': `{
         "name": "blah",
         "dependencies": {
-          "//": "'abc://' is not a valid protocol for NPM.",
-          "@angular-devkit-tests/update-base": "abc://foo.tgz"
+          "src": "src@link:./src",
+          "@angular-devkit-tests/update-base": "1.0.0"
         }
       }`,
     })));
 
-    schematicRunner.runSchematicAsync('update', { all: true }, tree).pipe(
-      catchError(err => {
-        expect(err instanceof SchematicsException).toBe(true);
-
-        return EMPTY;
-      }),
-    ).toPromise().then(done, done.fail);
+    const newTree = await schematicRunner.runSchematicAsync('update', {
+      packages: ['@angular-devkit-tests/update-base'],
+    }, tree).toPromise();
+    const { dependencies } = JSON.parse(newTree.readContent('/package.json'));
+    expect(dependencies['@angular-devkit-tests/update-base']).toBe('1.1.0');
   });
 
-  it('respects existing tilde and caret ranges', done => {
-    // Add ranges.
-    const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
-    const packageJson = JSON.parse(content);
-    packageJson['dependencies']['@angular-devkit-tests/update-base'] = '^1.0.0';
-    packageJson['dependencies']['@angular-devkit-tests/update-migrations'] = '~1.0.0';
-    host.sync.write(
-      normalize('/package.json'),
-      virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
-    );
-
-    schematicRunner.runSchematicAsync('update', { all: true }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        // This one should not change because 1.1.0 was already satisfied by ^1.0.0.
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe('^1.0.0');
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations'])
-          .toBe('~1.6.0');
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 45000);
-
-  it('calls migration tasks', done => {
-    // Add the basic migration package.
-    const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
-    const packageJson = JSON.parse(content);
-    packageJson['dependencies']['@angular-devkit-tests/update-migrations'] = '1.0.0';
-    host.sync.write(
-      normalize('/package.json'),
-      virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
-    );
-
-    schematicRunner.runSchematicAsync('update', { all: true }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe('1.1.0');
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations'])
-          .toBe('1.6.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'node-package',
-            options: jasmine.objectContaining({
-              command: 'install',
-            }),
-          },
-          {
-            name: 'run-schematic',
-            options: jasmine.objectContaining({
-              name: 'migrate',
-            }),
-          },
-        ]);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 45000);
-
   it('updates Angular as compatible with Angular N-1', done => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
diff --git a/packages/schematics/update/update/npm-package-json.ts b/packages/schematics/update/update/npm-package-json.ts
index 675c45c0fffb..93bcea36f8ef 100644
--- a/packages/schematics/update/update/npm-package-json.ts
+++ b/packages/schematics/update/update/npm-package-json.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 7dc4fb135f06..39fc3419905c 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -15,15 +15,16 @@ const ini = require('ini');
 const lockfile = require('@yarnpkg/lockfile');
 const pacote = require('pacote');
 
-const npmPackageJsonCache = new Map<string, Promise<Partial<NpmRepositoryPackageJson>>>();
-let npmrc: { [key: string]: string };
+type PackageManagerOptions = Record<string, unknown>;
 
+const npmPackageJsonCache = new Map<string, Promise<Partial<NpmRepositoryPackageJson>>>();
+let npmrc: PackageManagerOptions;
 
 function readOptions(
   logger: logging.LoggerApi,
   yarn = false,
   showPotentials = false,
-): Record<string, string> {
+): PackageManagerOptions {
   const cwd = process.cwd();
   const baseFilename = yarn ? 'yarnrc' : 'npmrc';
   const dotFilename = '.' + baseFilename;
@@ -55,7 +56,7 @@ function readOptions(
     logger.info(`Locating potential ${baseFilename} files:`);
   }
 
-  let options: { [key: string]: string } = {};
+  const options: PackageManagerOptions = {};
   for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
     if (existsSync(location)) {
       if (showPotentials) {
@@ -63,17 +64,40 @@ function readOptions(
       }
 
       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 { }
+      // Normalize RC options that are needed by 'npm-registry-fetch'.
+      // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
+      const rcConfig: PackageManagerOptions = yarn ? lockfile.parse(data) : ini.parse(data);
+      for (const [key, value] of Object.entries(rcConfig)) {
+        switch (key) {
+          case 'noproxy':
+          case 'no-proxy':
+            options['noProxy'] = value;
+            break;
+          case 'maxsockets':
+            options['maxSockets'] = value;
+            break;
+          case 'https-proxy':
+          case 'proxy':
+            options['proxy'] = value;
+            break;
+          case 'strict-ssl':
+            options['strictSSL'] = value;
+            break;
+          case 'local-address':
+            options['localAddress'] = value;
+            break;
+          case 'cafile':
+            if (typeof value === 'string') {
+              const cafile = path.resolve(path.dirname(location), value);
+              try {
+                options['ca'] = readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
+              } catch { }
+            }
+            break;
+          default:
+            options[key] = value;
+            break;
+        }
       }
     } else if (showPotentials) {
       logger.info(`Trying '${location}'...not found.`);
@@ -82,8 +106,9 @@ function readOptions(
 
   // Substitute any environment variable references
   for (const key in options) {
-    if (typeof options[key] === 'string') {
-      options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    const value = options[key];
+    if (typeof value === 'string') {
+      options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
     }
   }
 
diff --git a/packages/schematics/update/update/package-json.ts b/packages/schematics/update/update/package-json.ts
index b4162f6fd232..d29d77869cc6 100644
--- a/packages/schematics/update/update/package-json.ts
+++ b/packages/schematics/update/update/package-json.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index 97515d27746d..d921b9dd3ce6 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -19,11 +19,6 @@
       "default": false,
       "type": "boolean"
     },
-    "all": {
-      "description": "When true, update all packages in `package.json`.",
-      "default": false,
-      "type": "boolean"
-    },
     "next": {
       "description": "Update to the latest version, including beta and RCs.",
       "default": false,
@@ -55,7 +50,7 @@
       ]
     },
     "verbose": {
-      "description": "When true, display additional details during the update process.",
+      "description": "Display additional details during the update process.",
       "type": "boolean"
     },
     "packageManager": {
diff --git a/renovate.json b/renovate.json
index 9737facacc73..bece7922b7bf 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,8 +6,8 @@
   "separateMajorMinor": false,
   "prHourlyLimit": 2,
   "labels": [
-    "PR target: master-only",
-    "PR action: merge"
+    "target: minor",
+    "action: merge"
   ],
   "timezone": "America/Tijuana",
   "lockFileMaintenance": {
diff --git a/scripts/README.md b/scripts/README.md
index a431984013a7..a2c1961df4d7 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -79,10 +79,6 @@ e.g.
 $ devkit-admin release minor-beta --force
 ```
 
-## serialize
-
-Serialize JSON Schema into `.d.ts` files. This script is deprecated and doesn't work anymore.
-
 ## snapshots
 
 Create and upload snapshots. This is used in CI.
@@ -94,26 +90,10 @@ Flags:
   required.
 * `--githubTokenFile=<path>`. Reads the githubToken from a file instead of the command line (for CI).
 
-## special-thanks
-
-Calculates and output the list of special thanks.
-
-Flags:
-
-* `--sha=<git ref>`. The SHA to start the special thanks from. Calculates them from this sha to the HEAD.
-
 ## templates
 
 Compile and outputs the templates. For now, only README is being built and outputted.
 
-## bazel:test
-
-Run API and unit tests using Bazel.
-
-## bazel:integration
-
-Run integration tests using Bazel.
-
 ## validate
 
 Performs BUILD files and license validation.
diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 4c02e85ca11f..498267d46660 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
index a5d64ae462fb..bdd3d384d8e1 100644
--- a/scripts/build-schema.ts
+++ b/scripts/build-schema.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/build.ts b/scripts/build.ts
index 63b4f744a154..357635d904f2 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -259,6 +259,9 @@ export default async function(
         if (fileName.startsWith('test/') || fileName.startsWith('test\\')) {
           return false;
         }
+        if (pkg.name === '@angular-devkit/core' && fileName.startsWith('src/workspace/json/test')) {
+          return false;
+        }
 
         // Remove Bazel files from NPM.
         if (fileName === 'BUILD' || fileName === 'BUILD.bazel') {
diff --git a/scripts/changelog.ts b/scripts/changelog.ts
index 9f39babd2263..622970e13d33 100644
--- a/scripts/changelog.ts
+++ b/scripts/changelog.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -103,7 +103,7 @@ export default async function(args: ChangelogOptions, logger: logging.Logger) {
           headerPattern: /^(\w*)(?:\(([^)]*)\))?: (.*)$/,
           headerCorrespondence: ['type', 'scope', 'subject'],
           noteKeywords: ['BREAKING CHANGE'],
-          revertPattern: /^revert:\s([\s\S]*?)\s*This reverts commit (\w*)\./,
+          revertPattern: /^revert:?\s([\s\S]*?)\s*This reverts commit (\w*)\./i,
           revertCorrespondence: [`header`, `hash`],
         }),
       )
diff --git a/scripts/create.ts b/scripts/create.ts
index a54a527ddc2b..897e75469837 100644
--- a/scripts/create.ts
+++ b/scripts/create.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/dist-tag.ts b/scripts/dist-tag.ts
index de19b977952d..da09925ce911 100644
--- a/scripts/dist-tag.ts
+++ b/scripts/dist-tag.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/packages.ts b/scripts/packages.ts
index bf8044bee9a4..15fc742e8675 100644
--- a/scripts/packages.ts
+++ b/scripts/packages.ts
@@ -1,19 +1,37 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 colors from 'ansi-colors';
 
+const { packages, loadRootPackageJson, stableToExperimentalVersion } = require('../lib/packages');
 
-const { packages } = require('../lib/packages');
 
+export default function(args: { json: boolean, version: boolean, releaseCheck: boolean }, logger: logging.Logger) {
 
-export default function(args: { json: boolean, version: boolean }, logger: logging.Logger) {
-  if (args.json) {
+  if (args.releaseCheck) {
+    const {version: root} = loadRootPackageJson();
+    const experimental = stableToExperimentalVersion(root);
+    logger.info(`The expected version for the release is ${colors.bold(root)} (${experimental}) based on root package.json.`);
+    logger.info(
+      Object.keys(packages)
+        .filter(name => !packages[name].private)
+        .map(name => {
+          let result = colors.red(colors.symbols.cross);
+          const version = packages[name].version;
+          if ([root, experimental].includes(version)) {
+            result = colors.green(colors.symbols.check);
+          }
+
+          return ` ${result}  ${name}@${packages[name].version}`;
+        })
+        .join('\n'));
+  } else if (args.json) {
     logger.info(JSON.stringify(packages, null, 2));
   } else {
     logger.info(
diff --git a/scripts/publish.ts b/scripts/publish.ts
index 7f517e183e2b..5f892f7357ab 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -111,9 +111,9 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {
 export default async function (args: PublishArgs, logger: logging.Logger) {
   const { tag } = args;
   if (!tag) {
-    // NPM requires that all releases have a tag associated, defaulting to
-    // `latest`, so there is no way to allow a publish without a tag.
+    // NPM requires that all releases have a tag associated.
     // https://github.com/npm/npm/issues/10625#issuecomment-162106553
+    // Do not publish without a tag.
     throw new Error('--tag is required.');
   }
 
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 2c65de4b083f..c36750ed388a 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/special-thanks.ts b/scripts/special-thanks.ts
deleted file mode 100644
index ed00d3274c27..000000000000
--- a/scripts/special-thanks.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
- */
-// tslint:disable:no-implicit-dependencies
-import { logging } from '@angular-devkit/core';
-import { execSync } from 'child_process';
-
-export default function (opts: { sha: string }, logger: logging.Logger) {
-  const authors = execSync(`git log ${opts.sha}.. --format="%aN"`).toString();
-
-  const counter = new Map<string, number>();
-  for (const name of authors.split(/\r?\n/g)) {
-    if (name) {
-      const maybeCounter = counter.get(name);
-      counter.set(name, (maybeCounter || 0) + 1);
-    }
-  }
-
-  const sortedCount = [...counter.entries()].sort((a, b) => b[1] - a[1]);
-
-  for (const count of sortedCount) {
-    logger.info(count[0] + ' ' + count[1]);
-  }
-}
diff --git a/scripts/templates.ts b/scripts/templates.ts
index e0d22c303af7..e9bcdb6606de 100644
--- a/scripts/templates.ts
+++ b/scripts/templates.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/templates/changelog-fix.ejs b/scripts/templates/changelog-commit.ejs
similarity index 59%
rename from scripts/templates/changelog-fix.ejs
rename to scripts/templates/changelog-commit.ejs
index c7303ff1decb..9b1049315b1f 100644
--- a/scripts/templates/changelog-fix.ejs
+++ b/scripts/templates/changelog-commit.ejs
@@ -1,28 +1,28 @@
 <%
-  if (!hash) {
+  if (!commit.hash) {
     return;
   }
 
-  const shortSha = hash && hash.slice(0, 7);
+  const shortSha = commit.hash.slice(0, 7);
 %>
 <tr>
   <%# Commit: %>
   <td><%
   if (shortSha) {
     %>
-<a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img
+<a href="https://github.com/angular/angular-cli/commit/<%= commit.hash %>"><img
    align="top"
-   title="Bug Fix" src="https://img.shields.io/badge/<%= shortSha %>-fix-green.svg" />
+   title="<%= typeInfo.title %>" src="https://img.shields.io/badge/<%= shortSha %>-<%= commit.type %>-<%= typeInfo.badgeColor %>.svg" />
 </a><%
   } %>
   </td>
 
   <%# Desc: %>
-  <td><%= subject %></td>
+  <td><%= commit.subject %></td>
 
   <%# Notes: %>
   <td><%
-      for (const reference of references) {
+      for (const reference of commit.references) {
         if (!reference.action || !reference.issue) {
           continue;
         }
@@ -31,7 +31,6 @@
         const owner = reference.owner || 'angular';
         const repository = reference.repository || 'angular-cli';
         %>
-
 <a href="https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>">
   [Closes #<%= issue %>]<br />
 </a>
diff --git a/scripts/templates/changelog-feat.ejs b/scripts/templates/changelog-feat.ejs
deleted file mode 100644
index d12db7b800ca..000000000000
--- a/scripts/templates/changelog-feat.ejs
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-  if (!hash) {
-    return;
-  }
-
-  const shortSha = hash && hash.slice(0, 7);
-%>
-<tr>
-  <%# Commit: %>
-  <td><%
-  if (shortSha) {
-    %>
-<a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img
-   align="top"
-   title="Feature" src="https://img.shields.io/badge/<%= shortSha %>-feat-blue.svg" />
-</a><%
-  } %>
-  </td>
-
-  <%# Desc: %>
-  <td><%= subject %></td>
-
-  <%# Notes: %>
-  <td><%
-      for (const reference of references) {
-        if (!reference.action || !reference.issue) {
-          continue;
-        }
-
-        const issue = reference.issue;
-        const owner = reference.owner || 'angular';
-        const repository = reference.repository || 'angular-cli';
-        %>
-<a href="https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>">
-  [Closes #<%= issue %>]<br />
-</a>
-  <% } %>
-  </td>
-</tr>
\ No newline at end of file
diff --git a/scripts/templates/changelog-special-thanks.ejs b/scripts/templates/changelog-special-thanks.ejs
index 320437935f31..24b31602b95a 100644
--- a/scripts/templates/changelog-special-thanks.ejs
+++ b/scripts/templates/changelog-special-thanks.ejs
@@ -1,9 +1,10 @@
 <%
 const counter = Object.create(null);
+const botsAuthorName = ['dependabot[bot]', 'Renovate Bot'];
 
 for (const commit of commits) {
     const name = commit.authorName;
-    if (name) {
+    if (name && !botsAuthorName.includes(name)) {
         counter[name] = (counter[name] || 0) + 1;
     }
 }
diff --git a/scripts/templates/changelog.ejs b/scripts/templates/changelog.ejs
index ac72ee5b2d51..a104c351f9b7 100644
--- a/scripts/templates/changelog.ejs
+++ b/scripts/templates/changelog.ejs
@@ -55,18 +55,29 @@
         return aOrder == -1 ? bOrder == -1 ? (a || '').localeCompare(b || '') : 1 : aOrder - bOrder;
     });
 
-  for (const scope of scopes) {
-    // Do feature first, then fixes.
-    const allScopeCommits = commits.filter(x => x.scope === scope);
+  const ALLOWED_TYPES = {
+    'feat': {
+      badgeColor: 'blue',
+      title: 'Feature',
+    },
+    'fix': {
+      badgeColor: 'green',
+      title: 'Bug Fix',
+    },
+    'perf': {
+      badgeColor: 'orange',
+      title: 'Performance Improvement',
+    },
+  };
 
-    const scopeCommits = [
-      ...allScopeCommits.filter(x => x.type === 'feat'),
-      ...allScopeCommits.filter(x => x.type === 'fix'),
-    ];
+  for (const scope of scopes) {
+    const scopeCommits = commits.filter(x => x.scope === scope && !!ALLOWED_TYPES[x.type]);
 
     if (scopeCommits.length == 0) {
         continue;
     }
+
+    scopeCommits.sort((a,b) => a.type > b.type ? 1 : -1);
 %>
 <tr><td colspan=3><h3><%
   if (scope) {
@@ -83,11 +94,9 @@
 <%
     let nbRows = 0;
     for (const commit of scopeCommits) {
-        nbRows++;
-        switch (commit.type) {
-            case 'fix': %><%= include('./changelog-fix', commit) %><% break;
-            case 'feat': %><%= include('./changelog-feat', commit) %><% break;
-        }
+      nbRows++; %>
+      <%= include('./changelog-commit', { commit, typeInfo: ALLOWED_TYPES[commit.type] }) %>
+      <%
     }
 
     // Add an empty row to get the alternating colors in sync.
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index be0667a3ee3f..913fe2112308 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -117,7 +117,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
     git rebase master -i
     git push -f
     ```
-  * Add the `PR action: merge` label and the correct
+  * Add the `action: merge` label and the correct
 [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target)
     (if PR author has the project collaborator status, or else the last reviewer
     should do this).
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index 6dfdc841e65b..5ceccecf322f 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -128,8 +128,7 @@ There are two different test suites which can be run locally:
   * Run a subset of the tests, use the full Bazel target example: `yarn bazel test //packages/schematics/angular:angular_test`
   * For a complete list of test targets use the following Bazel query: `yarn bazel query "tests(//packages/...)"`
 
-You can find more info about debugging [tests with Bazel in the docs.]
-(https://github.com/angular/angular-cli/blob/master/docs/process/bazel.md#debugging-jasmine_node_test)  
+You can find more info about debugging [tests with Bazel in the docs.](https://github.com/angular/angular-cli/blob/master/docs/process/bazel.md#debugging-jasmine_node_test)  
 
 ### End to end tests
   * Run: `node tests/legacy-cli/run_e2e.js`
diff --git a/scripts/test.ts b/scripts/test.ts
index ada83ef6484a..4e166d98f683 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/validate-build-files.ts b/scripts/validate-build-files.ts
index f9d1388b6175..3257d385307f 100644
--- a/scripts/validate-build-files.ts
+++ b/scripts/validate-build-files.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/validate-do-not-submit.ts b/scripts/validate-do-not-submit.ts
deleted file mode 100644
index 9c8e5d90237a..000000000000
--- a/scripts/validate-do-not-submit.ts
+++ /dev/null
@@ -1,79 +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 } 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) {
-    if (!fileName || fileName.trim().length === 0) {
-      continue;
-    }
-
-    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/)) {
-      // 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-licenses.ts b/scripts/validate-licenses.ts
index 1df27defb855..eff5e1ff471e 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -30,6 +30,7 @@ const allowedLicenses = [
   'MIT',
   'ISC',
   'Apache-2.0',
+  'Python-2.0',
 
   'BSD-2-Clause',
   'BSD-3-Clause',
diff --git a/scripts/validate-user-analytics.ts b/scripts/validate-user-analytics.ts
index 725e2447ec81..de497d8540b6 100644
--- a/scripts/validate-user-analytics.ts
+++ b/scripts/validate-user-analytics.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/scripts/validate.ts b/scripts/validate.ts
index 9cb76a1ef2cd..825d3c52fca8 100644
--- a/scripts/validate.ts
+++ b/scripts/validate.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,11 +10,10 @@ import { logging, tags } from '@angular-devkit/core';
 import { execSync } from 'child_process';
 import templates from './templates';
 import validateBuildFiles from './validate-build-files';
-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; ci: boolean }, logger: logging.Logger) {
+export default async function (options: { verbose: boolean }, logger: logging.Logger) {
   let error = false;
 
   if (execSync(`git status --porcelain`).toString()) {
@@ -39,13 +38,6 @@ export default async function (options: { verbose: boolean; ci: boolean }, logge
     error = true;
   }
 
-  if (!options.ci) {
-    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
diff --git a/tests/angular_devkit/core/json/schema/serializers/0.0.javascript_spec.ts b/tests/angular_devkit/core/json/schema/serializers/0.0.javascript_spec.ts
index bc9e7f048881..ab31747be1c5 100644
--- a/tests/angular_devkit/core/json/schema/serializers/0.0.javascript_spec.ts
+++ b/tests/angular_devkit/core/json/schema/serializers/0.0.javascript_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/angular_devkit/core/json/schema/serializers/1.0.javascript_spec.ts b/tests/angular_devkit/core/json/schema/serializers/1.0.javascript_spec.ts
index 9d37e38db4f4..091657cf2326 100644
--- a/tests/angular_devkit/core/json/schema/serializers/1.0.javascript_spec.ts
+++ b/tests/angular_devkit/core/json/schema/serializers/1.0.javascript_spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 8fae654a21db..a66e9881710d 100644
--- a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
+++ b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
@@ -457,7 +457,7 @@
           "type": "object",
           "properties": {
             "sourcemaps": {
-              "description": "Output sourcemaps.",
+              "description": "Output source maps.",
               "type": "boolean"
             },
             "baseHref": {
diff --git a/tests/angular_devkit/core/node/jobs/add.ts b/tests/angular_devkit/core/node/jobs/add.ts
index c271d8cfd031..0aeb41e68f4a 100644
--- a/tests/angular_devkit/core/node/jobs/add.ts
+++ b/tests/angular_devkit/core/node/jobs/add.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/extra-properties/factory.ts b/tests/angular_devkit/schematics/tools/file-system-engine-host/extra-properties/factory.ts
index a0fe71e473a0..96755620d008 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/extra-properties/factory.ts
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/extra-properties/factory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -17,4 +17,3 @@ export default function(options: {}) {
     );
   };
 }
-
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
index dba7a8f554c5..8941900db2ad 100644
--- 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/null-factory.ts b/tests/angular_devkit/schematics/tools/file-system-engine-host/null-factory.ts
index a65cdc0316f4..5a6d8b90e828 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/null-factory.ts
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/null-factory.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/.angular-cli.json b/tests/legacy-cli/e2e/assets/1.0-project/.angular-cli.json
deleted file mode 100644
index 87c52afc90b8..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/.angular-cli.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "one-oh-project"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json"
-    },
-    {
-      "project": "src/tsconfig.spec.json"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig b/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig
deleted file mode 100644
index e89330a618c1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/1.0-project/.gitignore b/tests/legacy-cli/e2e/assets/1.0-project/.gitignore
deleted file mode 100644
index 54bfd2001e64..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/.gitignore
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-testem.log
-/typings
-
-# e2e
-/e2e/*.js
-/e2e/*.map
-
-# System Files
-.DS_Store
-Thumbs.db
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/README.md b/tests/legacy-cli/e2e/assets/1.0-project/README.md
deleted file mode 100644
index f0369813ccea..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# OneOhProject
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.
-
-## 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/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/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## 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/1.0-project/e2e/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/1.0-project/e2e/app.e2e-spec.ts
deleted file mode 100644
index 28aa6669b387..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/e2e/app.e2e-spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { OneOhProjectPage } from './app.po';
-
-describe('one-oh-project App', () => {
-  let page: OneOhProjectPage;
-
-  beforeEach(() => {
-    page = new OneOhProjectPage();
-  });
-
-  it('should display message saying app works', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/e2e/app.po.ts b/tests/legacy-cli/e2e/assets/1.0-project/e2e/app.po.ts
deleted file mode 100644
index 5a8e232ac895..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/e2e/app.po.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-export class OneOhProjectPage {
-  navigateTo() {
-    return browser.get('/');
-  }
-
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/e2e/tsconfig.e2e.json b/tests/legacy-cli/e2e/assets/1.0-project/e2e/tsconfig.e2e.json
deleted file mode 100644
index ac7a37325798..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/e2e/tsconfig.e2e.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "module": "commonjs",
-    "target": "es5",
-    "types":[
-      "jasmine",
-      "node"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/karma.conf.js b/tests/legacy-cli/e2e/assets/1.0-project/karma.conf.js
deleted file mode 100644
index ca70e74eee47..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/karma.conf.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*eslint-disable*/
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/0.13/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
-    ],
-    client:{
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    files: [
-      { pattern: './src/test.ts', watched: false }
-    ],
-    preprocessors: {
-      './src/test.ts': ['@angular/cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
-    },
-    coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
-      fixWebpackSourcePaths: true
-    },
-    angularCli: {
-      environment: 'dev'
-    },
-    reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'coverage-istanbul']
-              : ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
-};
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/package.json b/tests/legacy-cli/e2e/assets/1.0-project/package.json
deleted file mode 100644
index 713912dc4a80..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/package.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "one-oh-project",
-  "version": "0.0.0",
-  "license": "MIT",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^5.2.0",
-    "@angular/common": "^5.2.0",
-    "@angular/compiler": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "@angular/forms": "^5.2.0",
-    "@angular/http": "^5.2.0",
-    "@angular/platform-browser": "^5.2.0",
-    "@angular/platform-browser-dynamic": "^5.2.0",
-    "@angular/router": "^5.2.0",
-    "core-js": "^2.4.1",
-    "rxjs": "^5.5.6",
-    "zone.js": "^0.8.19"
-  },
-  "devDependencies": {
-    "@angular/cli": "0.0.0",
-    "@angular/compiler-cli": "^5.2.0",
-    "@types/jasmine": "2.5.38",
-    "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
-    "jasmine-core": "~2.5.2",
-    "jasmine-spec-reporter": "~3.2.0",
-    "karma": "~1.4.1",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-cli": "~1.0.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
-    "protractor": "~5.1.0",
-    "ts-node": "~4.1.0",
-    "tslint": "~5.9.1",
-    "typescript": "~2.4.2"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/protractor.conf.js b/tests/legacy-cli/e2e/assets/1.0-project/protractor.conf.js
deleted file mode 100644
index cdb43c5b4ab6..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/protractor.conf.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*eslint-disable*/
-// 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: [
-    './e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    browserName: 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  beforeLaunch: function() {
-    require('ts-node').register({
-      project: 'e2e/tsconfig.e2e.json'
-    });
-  },
-  onPrepare() {
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.html b/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.html
deleted file mode 100644
index b6931b538a2c..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>
-  {{title}}
-</h1>
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.spec.ts
deleted file mode 100644
index d715a39aa7e6..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'app works!'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app works!');
-  });
-
-  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('app works!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.ts
deleted file mode 100644
index ff63e0504887..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent {
-  title = 'app works!';
-}
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
deleted file mode 100644
index d39d998af88f..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-
-import { AppComponent } from './app.component';
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    FormsModule,
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/environments/environment.ts
deleted file mode 100644
index b7f639aecac5..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/environments/environment.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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/legacy-cli/e2e/assets/1.0-project/src/index.html b/tests/legacy-cli/e2e/assets/1.0-project/src/index.html
deleted file mode 100644
index 06219472244b..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>OneOhProject</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>Loading...</app-root>
-</body>
-</html>
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/main.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/main.ts
deleted file mode 100644
index a9ca1caf8cee..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/main.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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);
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
deleted file mode 100644
index a8f13561140d..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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/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 to support `@angular/animation`. */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-/** Evergreen browsers require these. **/
-import 'core-js/es6/reflect';
-import 'core-js/es7/reflect';
-
-
-/** ALL Firefox browsers require the following to support `@angular/animation`. **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-
-/***************************************************************************************************
- * Zone JS is required by Angular itself.
- */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
-
-/**
- * Date, currency, decimal and percent pipes.
- * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
- */
-// import 'intl';  // Run `npm install --save intl`.
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/test.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/test.ts
deleted file mode 100644
index 9bf72267e9b1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-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';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
-declare var __karma__: any;
-declare var require: any;
-
-// Prevent Karma from running prematurely.
-__karma__.loaded = function () {};
-
-// 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);
-// Finally, start Karma to run the tests.
-__karma__.start();
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.app.json b/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.app.json
deleted file mode 100644
index 5e2507db58c9..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.app.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "module": "es2015",
-    "baseUrl": "",
-    "types": []
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.spec.json
deleted file mode 100644
index 510e3f1fdae1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/tsconfig.spec.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "module": "commonjs",
-    "target": "es5",
-    "baseUrl": "",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/typings.d.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/typings.d.ts
deleted file mode 100644
index ef5c7bd62057..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/typings.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SystemJS module definition */
-declare var module: NodeModule;
-interface NodeModule {
-  id: string;
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/tsconfig.json b/tests/legacy-cli/e2e/assets/1.0-project/tsconfig.json
deleted file mode 100644
index a35a8ee3a40d..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "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": [
-      "es2016",
-      "dom"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/tslint.json b/tests/legacy-cli/e2e/assets/1.0-project/tslint.json
deleted file mode 100644
index 9113f1368b22..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-project/tslint.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "rulesDirectory": [
-    "node_modules/codelyzer"
-  ],
-  "rules": {
-    "callable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "import-blacklist": [true, "rxjs"],
-    "import-spacing": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "interface-over-type-literal": true,
-    "label-position": true,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-empty-interface": true,
-    "no-eval": true,
-    "no-inferrable-types": [true, "ignore-params"],
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-string-throw": true,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": 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": [
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "typeof-compare": true,
-    "unified-signatures": true,
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-
-    "directive-selector": [true, "attribute", "app", "camelCase"],
-    "component-selector": [true, "element", "app", "kebab-case"],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/package.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/package.json
deleted file mode 100644
index 944e7380e4e1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "private": true,
-  "workspaces": {
-    "packages": [
-      "packages/*"
-    ],
-    "nohoist": [
-      "**/codelyzer",
-      "**/codelyzer/**",
-      "**/@angular*",
-      "**/@angular*/**"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.angular-cli.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.angular-cli.json
deleted file mode 100644
index 87c52afc90b8..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.angular-cli.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "one-oh-project"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json"
-    },
-    {
-      "project": "src/tsconfig.spec.json"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.editorconfig b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.editorconfig
deleted file mode 100644
index e89330a618c1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/1.0-yarn-workspace-project/packages/app/.gitignore b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.gitignore
deleted file mode 100644
index 54bfd2001e64..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/.gitignore
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-testem.log
-/typings
-
-# e2e
-/e2e/*.js
-/e2e/*.map
-
-# System Files
-.DS_Store
-Thumbs.db
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/README.md b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/README.md
deleted file mode 100644
index f0369813ccea..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# OneOhProject
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.
-
-## 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/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/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## 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/1.0-yarn-workspace-project/packages/app/e2e/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/app.e2e-spec.ts
deleted file mode 100644
index 28aa6669b387..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/app.e2e-spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { OneOhProjectPage } from './app.po';
-
-describe('one-oh-project App', () => {
-  let page: OneOhProjectPage;
-
-  beforeEach(() => {
-    page = new OneOhProjectPage();
-  });
-
-  it('should display message saying app works', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/app.po.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/app.po.ts
deleted file mode 100644
index 5a8e232ac895..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/app.po.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-export class OneOhProjectPage {
-  navigateTo() {
-    return browser.get('/');
-  }
-
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/karma.conf.js b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/karma.conf.js
deleted file mode 100644
index ca70e74eee47..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/karma.conf.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*eslint-disable*/
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/0.13/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
-    ],
-    client:{
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    files: [
-      { pattern: './src/test.ts', watched: false }
-    ],
-    preprocessors: {
-      './src/test.ts': ['@angular/cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
-    },
-    coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
-      fixWebpackSourcePaths: true
-    },
-    angularCli: {
-      environment: 'dev'
-    },
-    reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'coverage-istanbul']
-              : ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
-};
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/package.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/package.json
deleted file mode 100644
index 713912dc4a80..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/package.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "one-oh-project",
-  "version": "0.0.0",
-  "license": "MIT",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^5.2.0",
-    "@angular/common": "^5.2.0",
-    "@angular/compiler": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "@angular/forms": "^5.2.0",
-    "@angular/http": "^5.2.0",
-    "@angular/platform-browser": "^5.2.0",
-    "@angular/platform-browser-dynamic": "^5.2.0",
-    "@angular/router": "^5.2.0",
-    "core-js": "^2.4.1",
-    "rxjs": "^5.5.6",
-    "zone.js": "^0.8.19"
-  },
-  "devDependencies": {
-    "@angular/cli": "0.0.0",
-    "@angular/compiler-cli": "^5.2.0",
-    "@types/jasmine": "2.5.38",
-    "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
-    "jasmine-core": "~2.5.2",
-    "jasmine-spec-reporter": "~3.2.0",
-    "karma": "~1.4.1",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-cli": "~1.0.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
-    "protractor": "~5.1.0",
-    "ts-node": "~4.1.0",
-    "tslint": "~5.9.1",
-    "typescript": "~2.4.2"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/protractor.conf.js b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/protractor.conf.js
deleted file mode 100644
index cdb43c5b4ab6..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/protractor.conf.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*eslint-disable*/
-// 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: [
-    './e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    browserName: 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  beforeLaunch: function() {
-    require('ts-node').register({
-      project: 'e2e/tsconfig.e2e.json'
-    });
-  },
-  onPrepare() {
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.css b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.css
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.html b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.html
deleted file mode 100644
index b6931b538a2c..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>
-  {{title}}
-</h1>
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.spec.ts
deleted file mode 100644
index d715a39aa7e6..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'app works!'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app works!');
-  });
-
-  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('app works!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.module.ts
deleted file mode 100644
index d39d998af88f..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-
-import { AppComponent } from './app.component';
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    FormsModule,
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/assets/.gitkeep b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.prod.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.prod.ts
deleted file mode 100644
index 3612073bc31c..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.prod.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const environment = {
-  production: true
-};
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.ts
deleted file mode 100644
index b7f639aecac5..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/environments/environment.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/favicon.ico b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/favicon.ico
deleted file mode 100644
index 8081c7ceaf2b..000000000000
Binary files a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/favicon.ico and /dev/null differ
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/index.html b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/index.html
deleted file mode 100644
index 06219472244b..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>OneOhProject</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>Loading...</app-root>
-</body>
-</html>
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/main.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/main.ts
deleted file mode 100644
index a9ca1caf8cee..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/main.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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);
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/polyfills.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/polyfills.ts
deleted file mode 100644
index a8f13561140d..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/polyfills.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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/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 to support `@angular/animation`. */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-/** Evergreen browsers require these. **/
-import 'core-js/es6/reflect';
-import 'core-js/es7/reflect';
-
-
-/** ALL Firefox browsers require the following to support `@angular/animation`. **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-
-/***************************************************************************************************
- * Zone JS is required by Angular itself.
- */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
-
-/**
- * Date, currency, decimal and percent pipes.
- * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
- */
-// import 'intl';  // Run `npm install --save intl`.
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/styles.css b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/styles.css
deleted file mode 100644
index 90d4ee0072ce..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/test.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/test.ts
deleted file mode 100644
index 9bf72267e9b1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-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';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
-declare var __karma__: any;
-declare var require: any;
-
-// Prevent Karma from running prematurely.
-__karma__.loaded = function () {};
-
-// 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);
-// Finally, start Karma to run the tests.
-__karma__.start();
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.app.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.app.json
deleted file mode 100644
index 5e2507db58c9..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.app.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "module": "es2015",
-    "baseUrl": "",
-    "types": []
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.spec.json
deleted file mode 100644
index 510e3f1fdae1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/tsconfig.spec.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "module": "commonjs",
-    "target": "es5",
-    "baseUrl": "",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/typings.d.ts b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/typings.d.ts
deleted file mode 100644
index ef5c7bd62057..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/typings.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SystemJS module definition */
-declare var module: NodeModule;
-interface NodeModule {
-  id: string;
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tsconfig.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tsconfig.json
deleted file mode 100644
index a35a8ee3a40d..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "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": [
-      "es2016",
-      "dom"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tslint.json b/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tslint.json
deleted file mode 100644
index 9113f1368b22..000000000000
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/tslint.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "rulesDirectory": [
-    "node_modules/codelyzer"
-  ],
-  "rules": {
-    "callable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "import-blacklist": [true, "rxjs"],
-    "import-spacing": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "interface-over-type-literal": true,
-    "label-position": true,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-empty-interface": true,
-    "no-eval": true,
-    "no-inferrable-types": [true, "ignore-params"],
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-string-throw": true,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": 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": [
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "typeof-compare": true,
-    "unified-signatures": true,
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-
-    "directive-selector": [true, "attribute", "app", "camelCase"],
-    "component-selector": [true, "element", "app", "kebab-case"],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/.angular-cli.json b/tests/legacy-cli/e2e/assets/1.7-project/.angular-cli.json
deleted file mode 100644
index 0e54ed353cee..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/.angular-cli.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "latest-project"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "src/tsconfig.spec.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json",
-      "exclude": "**/node_modules/**"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig b/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig
deleted file mode 100644
index e89330a618c1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/1.7-project/.gitignore b/tests/legacy-cli/e2e/assets/1.7-project/.gitignore
deleted file mode 100644
index 4ae2c37916a5..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/dist-server
-/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
-testem.log
-/typings
-
-# e2e
-/e2e/*.js
-/e2e/*.map
-
-# System Files
-.DS_Store
-Thumbs.db
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/README.md b/tests/legacy-cli/e2e/assets/1.7-project/README.md
deleted file mode 100644
index 281d381e31db..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# LatestProject
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.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/legacy-cli/e2e/assets/1.7-project/e2e/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/1.7-project/e2e/app.e2e-spec.ts
deleted file mode 100644
index 343be839f981..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/e2e/app.e2e-spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { AppPage } from './app.po';
-
-describe('latest-project App', () => {
-  let page: AppPage;
-
-  beforeEach(() => {
-    page = new AppPage();
-  });
-
-  it('should display welcome message', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/e2e/app.po.ts b/tests/legacy-cli/e2e/assets/1.7-project/e2e/app.po.ts
deleted file mode 100644
index 82ea75ba504a..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/e2e/app.po.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { browser, by, element } from 'protractor';
-
-export class AppPage {
-  navigateTo() {
-    return browser.get('/');
-  }
-
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/e2e/tsconfig.e2e.json b/tests/legacy-cli/e2e/assets/1.7-project/e2e/tsconfig.e2e.json
deleted file mode 100644
index 78b5000e2870..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/e2e/tsconfig.e2e.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
-    "module": "commonjs",
-    "target": "es2018",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/karma.conf.js b/tests/legacy-cli/e2e/assets/1.7-project/karma.conf.js
deleted file mode 100644
index 7754379974fb..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/karma.conf.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*eslint-disable*/
-// 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/cli'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
-    ],
-    client: {
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    coverageIstanbulReporter: {
-      reports: ['html', 'lcovonly'],
-      fixWebpackSourcePaths: true
-    },
-    angularCli: {
-      environment: 'dev'
-    },
-    reporters: ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
-};
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/package.json b/tests/legacy-cli/e2e/assets/1.7-project/package.json
deleted file mode 100644
index 17dfbf92a873..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "name": "latest-project",
-  "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": {
-    "@angular/animations": "^5.2.0",
-    "@angular/common": "^5.2.0",
-    "@angular/compiler": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "@angular/forms": "^5.2.0",
-    "@angular/http": "^5.2.0",
-    "@angular/platform-browser": "^5.2.0",
-    "@angular/platform-browser-dynamic": "^5.2.0",
-    "@angular/router": "^5.2.0",
-    "core-js": "^2.4.1",
-    "rxjs": "^5.5.6",
-    "zone.js": "^0.8.19"
-  },
-  "devDependencies": {
-    "@angular/cli": "0.0.0",
-    "@angular/compiler-cli": "^5.2.0",
-    "@angular/language-service": "^5.2.0",
-    "@types/jasmine": "2.8.3",
-    "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
-    "jasmine-core": "~2.8.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~2.0.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.2",
-    "ts-node": "~4.1.0",
-    "tslint": "~5.9.1",
-    "typescript": "~2.5.3"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/protractor.conf.js b/tests/legacy-cli/e2e/assets/1.7-project/protractor.conf.js
deleted file mode 100644
index 513957968bc5..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/protractor.conf.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*eslint-disable*/
-// 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: [
-    './e2e/**/*.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: 'e2e/tsconfig.e2e.json'
-    });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.css b/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.css
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.html b/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.html
deleted file mode 100644
index fa2706a406ba..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--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>
-
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.spec.ts
deleted file mode 100644
index b7e5ffcd9bc1..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  });
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-  it(`should have as title 'app'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app');
-  });
-  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 app!');
-  });
-});
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.ts
deleted file mode 100644
index 7b0f67283151..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-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/legacy-cli/e2e/assets/1.7-project/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.module.ts
deleted file mode 100644
index 926975afe8af..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/app/app.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-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/legacy-cli/e2e/assets/1.7-project/src/assets/.gitkeep b/tests/legacy-cli/e2e/assets/1.7-project/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.prod.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.prod.ts
deleted file mode 100644
index 3612073bc31c..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.prod.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const environment = {
-  production: true
-};
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.ts
deleted file mode 100644
index b7f639aecac5..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/environments/environment.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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/legacy-cli/e2e/assets/1.7-project/src/favicon.ico b/tests/legacy-cli/e2e/assets/1.7-project/src/favicon.ico
deleted file mode 100644
index 8081c7ceaf2b..000000000000
Binary files a/tests/legacy-cli/e2e/assets/1.7-project/src/favicon.ico and /dev/null differ
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/main.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/main.ts
deleted file mode 100644
index 91ec6da5f078..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/main.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-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/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
deleted file mode 100644
index 02dd2ab75de2..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * 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';
-
-/** 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
- **/
-// 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__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/legacy-cli/e2e/assets/1.7-project/src/styles.css b/tests/legacy-cli/e2e/assets/1.7-project/src/styles.css
deleted file mode 100644
index 90d4ee0072ce..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.app.json b/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.app.json
deleted file mode 100644
index 39ba8dbacbbe..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.app.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "baseUrl": "./",
-    "module": "es2015",
-    "types": []
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.spec.json
deleted file mode 100644
index ac22a298acaa..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/tsconfig.spec.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "baseUrl": "./",
-    "module": "commonjs",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/typings.d.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/typings.d.ts
deleted file mode 100644
index ef5c7bd62057..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/typings.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SystemJS module definition */
-declare var module: NodeModule;
-interface NodeModule {
-  id: string;
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/tsconfig.json b/tests/legacy-cli/e2e/assets/1.7-project/tsconfig.json
deleted file mode 100644
index a6c016bf38ad..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/tslint.json b/tests/legacy-cli/e2e/assets/1.7-project/tslint.json
deleted file mode 100644
index 9963d6c3954c..000000000000
--- a/tests/legacy-cli/e2e/assets/1.7-project/tslint.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "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,
-    "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/assets/7.0-project/.editorconfig b/tests/legacy-cli/e2e/assets/7.0-project/.editorconfig
deleted file mode 100644
index e89330a618c1..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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
deleted file mode 100644
index ee5c9d8336b7..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/.gitignore
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/e2e/src/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts
deleted file mode 100644
index 137ce38ff589..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 72e463a33539..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.po.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index db33721a1918..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/e2e/tsconfig.e2e.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "module": "commonjs",
-    "target": "es2018",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/package.json b/tests/legacy-cli/e2e/assets/7.0-project/package.json
deleted file mode 100644
index fa5e065c8a6b..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "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.component.css b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.css
deleted file mode 100644
index e69de29bb2d1..000000000000
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
deleted file mode 100644
index 156d6109afa3..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-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/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
deleted file mode 100644
index e69de29bb2d1..000000000000
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
deleted file mode 100644
index 77d85a09faef..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 9981b700abf6..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LazyCompComponent } from './lazy-comp.component';
-
-describe('LazyCompComponent', () => {
-  let component: LazyCompComponent;
-  let fixture: ComponentFixture<LazyCompComponent>;
-
-  beforeEach(async () => {
-    await 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
deleted file mode 100644
index ef413e598468..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index e5b323332e9e..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-routing.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 44f745b3ca84..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist b/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist
deleted file mode 100644
index 37371cb04b9f..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
deleted file mode 100644
index 3612073bc31c..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.prod.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const environment = {
-  production: true
-};
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
deleted file mode 100644
index 8081c7ceaf2b..000000000000
Binary files a/tests/legacy-cli/e2e/assets/7.0-project/src/favicon.ico and /dev/null differ
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
deleted file mode 100644
index 18e71f811dcc..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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/styles.css b/tests/legacy-cli/e2e/assets/7.0-project/src/styles.css
deleted file mode 100644
index 90d4ee0072ce..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* 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
deleted file mode 100644
index 16317897b1c5..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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
deleted file mode 100644
index 190fd300b601..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.app.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "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
deleted file mode 100644
index de7733630eb2..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.spec.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "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
deleted file mode 100644
index 52e2c1a5a74c..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/tslint.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "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/tslint.json b/tests/legacy-cli/e2e/assets/7.0-project/tslint.json
deleted file mode 100644
index 6ddb6b293151..000000000000
--- a/tests/legacy-cli/e2e/assets/7.0-project/tslint.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "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/assets/7.0-project/README.md b/tests/legacy-cli/e2e/assets/8.0-project/README.md
similarity index 94%
rename from tests/legacy-cli/e2e/assets/7.0-project/README.md
rename to tests/legacy-cli/e2e/assets/8.0-project/README.md
index 5223c63955d2..2a085c145853 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/README.md
+++ b/tests/legacy-cli/e2e/assets/8.0-project/README.md
@@ -1,6 +1,6 @@
-# SevenOhProject
+# EightProject
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.7.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.6.
 
 ## Development server
 
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/angular.json b/tests/legacy-cli/e2e/assets/8.0-project/angular.json
similarity index 69%
rename from tests/legacy-cli/e2e/assets/7.0-project/angular.json
rename to tests/legacy-cli/e2e/assets/8.0-project/angular.json
index 98de2c2a14ed..f19ab692aa2d 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/angular.json
+++ b/tests/legacy-cli/e2e/assets/8.0-project/angular.json
@@ -3,27 +3,32 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "seven-oh-project": {
+    "eight-project": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/seven-oh-project",
+            "outputPath": "dist/eight-project",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
+            "aot": false,
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.scss"
             ],
             "scripts": []
           },
@@ -57,18 +62,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "seven-oh-project:build"
+            "browserTarget": "eight-project:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "seven-oh-project:build:production"
+              "browserTarget": "eight-project:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "seven-oh-project:build"
+            "browserTarget": "eight-project:build"
           }
         },
         "test": {
@@ -76,60 +81,44 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.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"
+            "devServerTarget": "eight-project:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "seven-oh-project:serve:production"
+              "devServerTarget": "eight-project:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
-    }
-  },
-  "defaultProject": "seven-oh-project"
+    }},
+  "defaultProject": "eight-project"
 }
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/browserslist b/tests/legacy-cli/e2e/assets/8.0-project/browserslist
new file mode 100644
index 000000000000..80848532e47d
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/browserslist
@@ -0,0 +1,12 @@
+# 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
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.
\ 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/8.0-project/e2e/protractor.conf.js
similarity index 84%
rename from tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js
rename to tests/legacy-cli/e2e/assets/8.0-project/e2e/protractor.conf.js
index fda004eb85fd..7c798cfff07e 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js
+++ b/tests/legacy-cli/e2e/assets/8.0-project/e2e/protractor.conf.js
@@ -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: [
@@ -21,7 +25,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/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.e2e-spec.ts
new file mode 100644
index 000000000000..afe2417e8a9b
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,23 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getTitleText()).toEqual('Welcome to eight-project!');
+  });
+
+  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,
+    } as logging.Entry));
+  });
+});
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.po.ts b/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.po.ts
new file mode 100644
index 000000000000..5776aa9eb80d
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/e2e/src/app.po.ts
@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get(browser.baseUrl) as Promise<any>;
+  }
+
+  getTitleText() {
+    return element(by.css('app-root h1')).getText() as Promise<string>;
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/tsconfig.e2e.json b/tests/legacy-cli/e2e/assets/8.0-project/e2e/tsconfig.json
similarity index 83%
rename from tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/tsconfig.e2e.json
rename to tests/legacy-cli/e2e/assets/8.0-project/e2e/tsconfig.json
index ac7a37325798..39b800f78961 100644
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/e2e/tsconfig.e2e.json
+++ b/tests/legacy-cli/e2e/assets/8.0-project/e2e/tsconfig.json
@@ -4,8 +4,9 @@
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
-    "types":[
+    "types": [
       "jasmine",
+      "jasminewd2",
       "node"
     ]
   }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js b/tests/legacy-cli/e2e/assets/8.0-project/karma.conf.js
similarity index 82%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js
rename to tests/legacy-cli/e2e/assets/8.0-project/karma.conf.js
index b6e00421c95f..7830d5f888ef 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js
+++ b/tests/legacy-cli/e2e/assets/8.0-project/karma.conf.js
@@ -16,8 +16,8 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../coverage'),
-      reports: ['html', 'lcovonly'],
+      dir: require('path').join(__dirname, './coverage/eight-project'),
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
     reporters: ['progress', 'kjhtml'],
@@ -26,6 +26,7 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    restartOnFileChange: true
   });
-};
\ No newline at end of file
+};
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/package.json b/tests/legacy-cli/e2e/assets/8.0-project/package.json
new file mode 100644
index 000000000000..bbb621f7130c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "eight-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": "~8.0.3",
+    "@angular/common": "~8.0.3",
+    "@angular/compiler": "~8.0.3",
+    "@angular/core": "~8.0.3",
+    "@angular/forms": "~8.0.3",
+    "@angular/platform-browser": "~8.0.3",
+    "@angular/platform-browser-dynamic": "~8.0.3",
+    "@angular/router": "~8.0.3",
+    "rxjs": "~6.4.0",
+    "tslib": "^1.9.0",
+    "zone.js": "~0.9.1"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "~0.800.6",
+    "@angular/cli": "~8.0.6",
+    "@angular/compiler-cli": "~8.0.3",
+    "@angular/language-service": "~8.0.3",
+    "@types/node": "~8.9.4",
+    "@types/jasmine": "~3.3.8",
+    "@types/jasminewd2": "~2.0.3",
+    "codelyzer": "^5.0.0",
+    "jasmine-core": "~3.4.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~4.1.0",
+    "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.15.0",
+    "typescript": "~3.4.3"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app-routing.module.ts
similarity index 70%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app-routing.module.ts
index 942c8098dc82..d425c6f56b57 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-const routes: Routes = [{ path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }];
+const routes: Routes = [];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.html
similarity index 89%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.html
index 1094e7ebdfb8..0f3d9d8b9f8e 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/app/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/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.css b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.scss
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.0-project/src/app/app.component.css
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.scss
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.spec.ts
similarity index 68%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.spec.ts
index 15b4d442f5be..ba7327a810ee 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.spec.ts
@@ -1,18 +1,18 @@
-import { TestBed } from '@angular/core/testing';
-import { RouterModule } from '@angular/router';
+import { TestBed, async } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        RouterTestingModule
+      ],
       declarations: [
         AppComponent
       ],
-      imports: [
-        RouterModule.forRoot([])
-      ],
     }).compileComponents();
-  });
+  }));
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
@@ -20,16 +20,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'seven-oh-project'`, () => {
+  it(`should have as title 'eight-project'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('seven-oh-project');
+    expect(app.title).toEqual('eight-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!');
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to eight-project!');
   });
 });
diff --git a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.ts
similarity index 70%
rename from tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.ts
index ff63e0504887..6f0d72ab53df 100644
--- a/tests/legacy-cli/e2e/assets/1.0-yarn-workspace-project/packages/app/src/app/app.component.ts
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
-  title = 'app works!';
+  title = 'eight-project';
 }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.module.ts
similarity index 94%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/app/app.module.ts
index d718d9ba2b50..2c3ba2995c85 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/app/app.module.ts
@@ -10,7 +10,7 @@ import { AppComponent } from './app.component';
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule,
+    AppRoutingModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/assets/.gitkeep b/tests/legacy-cli/e2e/assets/8.0-project/src/assets/.gitkeep
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.0-project/src/assets/.gitkeep
rename to tests/legacy-cli/e2e/assets/8.0-project/src/assets/.gitkeep
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/environments/environment.prod.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/environments/environment.prod.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.0-project/src/environments/environment.prod.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/environments/environment.prod.ts
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/environments/environment.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/environments/environment.ts
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/favicon.ico b/tests/legacy-cli/e2e/assets/8.0-project/src/favicon.ico
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.0-project/src/favicon.ico
rename to tests/legacy-cli/e2e/assets/8.0-project/src/favicon.ico
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/index.html b/tests/legacy-cli/e2e/assets/8.0-project/src/index.html
similarity index 89%
rename from tests/legacy-cli/e2e/assets/1.7-project/src/index.html
rename to tests/legacy-cli/e2e/assets/8.0-project/src/index.html
index 94e4418225bf..2cba33bcd2c2 100644
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/index.html
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>LatestProject</title>
+  <title>EightProject</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/main.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/main.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/main.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/main.ts
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/polyfills.ts
similarity index 56%
rename from tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/polyfills.ts
index ee8b84da807c..aa665d6b8740 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts
+++ b/tests/legacy-cli/e2e/assets/8.0-project/src/polyfills.ts
@@ -18,57 +18,40 @@
  * 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
+ * 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;
+ *
  */
 
- // (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.
  */
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/styles.css b/tests/legacy-cli/e2e/assets/8.0-project/src/styles.scss
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.0-project/src/styles.css
rename to tests/legacy-cli/e2e/assets/8.0-project/src/styles.scss
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/test.ts b/tests/legacy-cli/e2e/assets/8.0-project/src/test.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/1.7-project/src/test.ts
rename to tests/legacy-cli/e2e/assets/8.0-project/src/test.ts
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.app.json b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.app.json
new file mode 100644
index 000000000000..31f8397ac9f3
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.app.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/test.ts",
+    "src/**/*.spec.ts"
+  ]
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.json
similarity index 75%
rename from tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json
rename to tests/legacy-cli/e2e/assets/8.0-project/tsconfig.json
index 46aeded1b278..a4df54fff629 100644
--- a/tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json
+++ b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.json
@@ -5,11 +5,12 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
+    "downlevelIteration": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.spec.json
new file mode 100644
index 000000000000..6400fde7d544
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/tsconfig.spec.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/tests/legacy-cli/e2e/assets/8.0-project/tslint.json b/tests/legacy-cli/e2e/assets/8.0-project/tslint.json
new file mode 100644
index 000000000000..6b7a0e83118e
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/8.0-project/tslint.json
@@ -0,0 +1,88 @@
+{
+  "extends": "tslint:recommended",
+  "rules": {
+    "array-type": false,
+    "arrow-parens": false,
+    "deprecation": {
+      "severity": "warning"
+    },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
+    "interface-name": false,
+    "max-classes-per-file": false,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-consecutive-blank-lines": false,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-empty": false,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    "no-switch-case-fall-through": true,
+    "no-use-before-declare": true,
+    "no-var-requires": false,
+    "object-literal-key-quotes": [
+      true,
+      "as-needed"
+    ],
+    "object-literal-sort-keys": false,
+    "ordered-imports": false,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "trailing-comma": false,
+    "no-conflicting-lifecycle": true,
+    "no-host-metadata-property": true,
+    "no-input-rename": true,
+    "no-inputs-metadata-property": true,
+    "no-output-native": true,
+    "no-output-on-prefix": true,
+    "no-output-rename": 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
+  },
+  "rulesDirectory": [
+    "codelyzer"
+  ]
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
index 5e06ee2c0b68..5813bf6e0b9c 100644
--- a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
+++ b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
@@ -19,23 +19,26 @@ exports.config = {
   multiCapabilities: [
     {
       browserName: 'chrome',
-      version: '80',
+      platform: 'Windows 10',
+      version: '89.0',
       tunnelIdentifier,
     },
     {
       browserName: 'firefox',
-      version: '72',
+      version: '86.0',
+      platform: 'Windows 10',
       tunnelIdentifier,
     },
     {
       browserName: 'firefox',
-      version: '68', // Latest Firefox ESR version
+      version: '78.0', // Latest Firefox ESR version
+      platform: 'Windows 10',
       tunnelIdentifier,
     },
     {
       browserName: 'safari',
-      platform: 'macOS 10.13',
-      version: '12.1',
+      platform: 'macOS 11.00',
+      version: '14',
       tunnelIdentifier,
     },
     {
@@ -53,13 +56,7 @@ exports.config = {
     {
       browserName: "MicrosoftEdge",
       platform: 'Windows 10',
-      version: "17.17134",
-      tunnelIdentifier,
-    },
-    {
-      browserName: "MicrosoftEdge",
-      platform: 'Windows 10',
-      version: "18.17763",
+      version: "88.0",
       tunnelIdentifier,
     },
   ],
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/aotplugin.config.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/aotplugin.config.json
deleted file mode 100644
index b6d2d7a7816d..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/aotplugin.config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "tsConfigPath": "./not/so/source/tsconfig.json",
-  "mainPath": "app/main.jit.ts"
-}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.html
deleted file mode 100644
index 3505c196ea74..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-  <h1>hello world</h1>
-  <a [routerLink]="['lazy']">lazy</a>
-  <router-outlet></router-outlet>
-</div>
-
-<!-- @ifdef DEBUG -->
-<p>DEBUG_ONLY</p>
-<!-- @endif -->
-
-<!-- @ifndef DEBUG -->
-<p>PRODUCTION_ONLY</p>
-<!-- @endif -->
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.scss
deleted file mode 100644
index ba143f5d5da1..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-:host {
-  background-color: blue;
-}
-
-// @ifdef DEBUG
-:host::before {
-  content: 'DEBUG_ONLY';
-}
-// @endif
-
-// @ifndef DEBUG
-:host::before {
-  content: 'PRODUCTION_ONLY';
-}
-// @endif
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.ts
deleted file mode 100644
index 09a19ad8f1ac..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {Component, ViewEncapsulation} from '@angular/core';
-
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class AppComponent { }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.module.ts
deleted file mode 100644
index 2bcd6c4883bd..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NgModule, Component } from '@angular/core';
-import { BrowserModule  } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
-
-@Component({
-  selector: 'home-view',
-  template: 'home!'
-})
-export class HomeView {}
-
-
-// @ifdef DEBUG
-console.log("DEBUG_ONLY");
-// @endif
-
-// @ifndef DEBUG
-console.log("PRODUCTION_ONLY");
-// @endif
-
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    HomeView
-  ],
-  imports: [
-    BrowserModule,
-    RouterModule.forRoot([
-      {path: 'lazy', loadChildren: './lazy.module#LazyModule'},
-      {path: '', component: HomeView}
-    ])
-  ],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/feature.module.ts
deleted file mode 100644
index f464ca028b05..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/feature.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'feature-component',
-  template: 'foo.html'
-})
-export class FeatureComponent {}
-
-@NgModule({
-  declarations: [
-    FeatureComponent
-  ],
-  imports: [
-    RouterModule.forChild([
-      { path: '', component: FeatureComponent}
-    ])
-  ]
-})
-export class FeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/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
deleted file mode 100644
index b7d72eab327b..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/lazy-feature.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'lazy-feature-comp',
-  template: 'lazy feature!'
-})
-export class LazyFeatureComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {path: '', component: LazyFeatureComponent, pathMatch: 'full'},
-      {path: 'feature', loadChildren: './feature.module#FeatureModule'}
-    ])
-  ],
-  declarations: [LazyFeatureComponent]
-})
-export class LazyFeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts
deleted file mode 100644
index 32c07594ac3d..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'lazy-comp',
-  template: 'lazy!'
-})
-export class LazyComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     {path: '', component: LazyComponent, pathMatch: 'full'},
-     {path: 'feature', loadChildren: './feature/feature.module#FeatureModule'},
-     {path: 'lazy-feature', loadChildren: './feature/lazy-feature.module#LazyFeatureModule'}
-    ]),
-  ],
-  declarations: [LazyComponent]
-})
-export class LazyModule {}
-
-export class SecondModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/main.jit.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/main.jit.ts
deleted file mode 100644
index a2a7a6c6b76c..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/main.jit.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'core-js/proposals/reflect-metadata';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {AppModule} from './app.module';
-
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/index.html b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/index.html
deleted file mode 100644
index 89fb0893c35d..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-  <base href="">
-</head>
-<body>
-  <app-root></app-root>
-  <script src="node_modules/zone.js/dist/zone.js"></script>
-  <script src="dist/app.main.js"></script>
-</body>
-</html>
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json
deleted file mode 100644
index 20c6851c877c..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "es2015",
-    "moduleResolution": "node",
-    "target": "es5",
-    "noImplicitAny": false,
-    "sourceMap": true,
-    "mapRoot": "",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": [
-      "es2017",
-      "dom"
-    ],
-    "outDir": "lib",
-    "skipLibCheck": true,
-    "rootDir": "."
-  },
-  "angularCompilerOptions": {
-    "enableIvy": true,
-    "disableTypeScriptVersionCheck": true
-    "genDir": "app/generated/",
-    "entryModule": "app/app.module#AppModule"
-  }
-}
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
deleted file mode 100644
index 4ee98497234f..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "test",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/common": "9.0.0",
-    "@angular/compiler": "9.0.0",
-    "@angular/compiler-cli": "9.0.0",
-    "@angular/core": "9.0.0",
-    "@angular/platform-browser": "9.0.0",
-    "@angular/platform-browser-dynamic": "9.0.0",
-    "@angular/platform-server": "9.0.0",
-    "@angular/router": "9.0.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.6.4",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.config.js
deleted file mode 100644
index cf5f4020dde2..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.config.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const ngToolsWebpack = require('@ngtools/webpack');
-const path = require('path');
-
-const flags = require('./webpack.flags.json');
-
-const preprocessLoader = 'preprocess-loader' + (flags.DEBUG ? '?+DEBUG' : '');
-
-
-module.exports = {
-  resolve: {
-    extensions: ['.ts', '.js']
-  },
-  entry: './not/so/source/app/main.jit.ts',
-  output: {
-    path: path.resolve('./dist'),
-    publicPath: 'dist/',
-    filename: 'app.main.js'
-  },
-  plugins: [
-    new ngToolsWebpack.AngularCompilerPlugin(require('./aotplugin.config.json'))
-  ],
-  module: {
-    rules: [
-      { test: /\.scss$/, loaders: ['raw-loader', 'sass-loader', preprocessLoader] },
-      { test: /\.css$/, loader: 'raw-loader' },
-      { test: /\.html$/, loaders: ['raw-loader', preprocessLoader] },
-      // Use preprocess to remove DEBUG only code.
-      // @ngtools/webpack must be the first (right most) loader.
-      { test: /\.ts$/, use: [
-        { loader: preprocessLoader },
-        { loader: '@ngtools/webpack' }
-      ] }
-    ]
-  },
-  devServer: {
-    historyApiFallback: true
-  }
-};
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.flags.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.flags.json
deleted file mode 100644
index aac05f738dc8..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.flags.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "DEBUG": false
-}
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 f51413216fd4..f6501e161a4b 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
@@ -2,26 +2,25 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "9.0.0",
-    "@angular/compiler": "9.0.0",
-    "@angular/compiler-cli": "9.0.0",
-    "@angular/core": "9.0.0",
-    "@angular/platform-browser": "9.0.0",
-    "@angular/platform-browser-dynamic": "9.0.0",
-    "@angular/platform-server": "9.0.0",
-    "@angular/router": "9.0.0",
+    "@angular/common": "11.0.0",
+    "@angular/compiler": "11.0.0",
+    "@angular/compiler-cli": "11.0.0",
+    "@angular/core": "11.0.0",
+    "@angular/platform-browser": "11.0.0",
+    "@angular/platform-browser-dynamic": "11.0.0",
+    "@angular/platform-server": "11.0.0",
+    "@angular/router": "11.0.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.6.4",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
+    "raw-loader": "^4.0.2",
+    "sass": "^1.32.5",
+    "sass-loader": "^10.1.1",
+    "typescript": "~4.0.1",
+    "webpack": "^4.0.1",
+    "webpack-cli": "^4.4.0"
   }
 }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
index 7a47bfc4b3ac..46d83664cba4 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     "baseUrl": "",
-    "module": "es2015",
+    "module": "es2020",
     "moduleResolution": "node",
-    "target": "es5",
+    "target": "es2015",
     "noImplicitAny": false,
     "sourceMap": true,
     "mapRoot": "",
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js
index 2e6f55628a10..16154679d000 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js
@@ -19,7 +19,6 @@ module.exports = {
   module: {
     rules: [
       { test: /\.scss$/, loaders: ['raw-loader', 'sass-loader'] },
-      { test: /\.css$/, loader: 'raw-loader' },
       { test: /\.html$/, loader: 'raw-loader' },
       { test: /\.ts$/, loader: '@ngtools/webpack' }
     ]
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.html
deleted file mode 100644
index 5a532db9308f..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  <h1>hello world</h1>
-  <a [routerLink]="['lazy']">lazy</a>
-  <router-outlet></router-outlet>
-</div>
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.scss
deleted file mode 100644
index 5cde7b922336..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  background-color: blue;
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.ts
deleted file mode 100644
index 82a4059565d3..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {Component, ViewEncapsulation} from '@angular/core';
-import {MyInjectable} from './injectable';
-
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class AppComponent {
-  constructor(public inj: MyInjectable) {
-    console.log(inj);
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.module.ts
deleted file mode 100644
index 7c8a0c296448..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NgModule, Component } from '@angular/core';
-import { ServerModule  } from '@angular/platform-server';
-import { BrowserModule } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
-
-import { AppComponent } from './app.component';
-import { MyInjectable } from './injectable';
-
-@Component({
-  selector: 'home-view',
-  template: 'home!'
-})
-export class HomeView {}
-
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    HomeView
-  ],
-  imports: [
-    BrowserModule.withServerTransition({
-      appId: 'app'
-    }),
-    ServerModule,
-    RouterModule.forRoot([
-      {path: 'lazy', loadChildren: './lazy.module#LazyModule'},
-      {path: '', component: HomeView}
-    ])
-  ],
-  providers: [MyInjectable],
-  bootstrap: [AppComponent]
-})
-export class AppModule {
-  static testProp: string;
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/feature.module.ts
deleted file mode 100644
index f464ca028b05..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/feature.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'feature-component',
-  template: 'foo.html'
-})
-export class FeatureComponent {}
-
-@NgModule({
-  declarations: [
-    FeatureComponent
-  ],
-  imports: [
-    RouterModule.forChild([
-      { path: '', component: FeatureComponent}
-    ])
-  ]
-})
-export class FeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts
deleted file mode 100644
index b7d72eab327b..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'lazy-feature-comp',
-  template: 'lazy feature!'
-})
-export class LazyFeatureComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {path: '', component: LazyFeatureComponent, pathMatch: 'full'},
-      {path: 'feature', loadChildren: './feature.module#FeatureModule'}
-    ])
-  ],
-  declarations: [LazyFeatureComponent]
-})
-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
deleted file mode 100644
index 3ed533966fe7..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/injectable.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-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-server-app/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/lazy.module.ts
deleted file mode 100644
index 7430b634ec68..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/lazy.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {NgModule, Component} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-@Component({
-  selector: 'lazy-comp',
-  template: 'lazy!'
-})
-export class LazyComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     {path: '', component: LazyComponent, pathMatch: 'full'},
-     {path: 'feature', loadChildren: './feature/feature.module#FeatureModule'},
-     {path: 'lazy-feature', loadChildren: './feature/lazy-feature.module#LazyFeatureModule'}
-    ])
-  ],
-  declarations: [LazyComponent]
-})
-export class LazyModule {}
-
-export class SecondModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.commonjs.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.commonjs.ts
deleted file mode 100644
index ce26d93a11de..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.commonjs.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AppModule } from './app.module';
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.ts
deleted file mode 100644
index 647681b8b76c..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'core-js/proposals/reflect-metadata';
-import {platformDynamicServer, renderModule} from '@angular/platform-server';
-import {AppModule} from './app.module';
-
-AppModule.testProp = 'testing';
-
-platformDynamicServer().bootstrapModule(AppModule);
-
-renderModule(AppModule, {
-  document: '<app-root></app-root>',
-  url: '/'
-});
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.html b/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.html
deleted file mode 100644
index 89fb0893c35d..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-  <base href="">
-</head>
-<body>
-  <app-root></app-root>
-  <script src="node_modules/zone.js/dist/zone.js"></script>
-  <script src="dist/app.main.js"></script>
-</body>
-</html>
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.js b/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.js
deleted file mode 100644
index bdfb2e792acd..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const fs = require('fs');
-const { AppModuleNgFactory } = require('./dist/app.main');
-const { renderModuleFactory } = require('@angular/platform-server');
-
-require('zone.js/dist/zone-node');
-
-renderModuleFactory(AppModuleNgFactory, {
-  url: '/',
-  document: '<app-root></app-root>'
-}).then(html => {
-  fs.writeFileSync('dist/index.html', html);
-})
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
deleted file mode 100644
index 85e57a5da5b5..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "test",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/animations": "9.0.0",
-    "@angular/common": "9.0.0",
-    "@angular/compiler": "9.0.0",
-    "@angular/compiler-cli": "9.0.0",
-    "@angular/core": "9.0.0",
-    "@angular/platform-browser": "9.0.0",
-    "@angular/platform-browser-dynamic": "9.0.0",
-    "@angular/platform-server": "9.0.0",
-    "@angular/router": "9.0.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.6.4",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json
deleted file mode 100644
index 5e63e01f6871..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": "",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "target": "es5",
-    "noImplicitAny": false,
-    "sourceMap": true,
-    "mapRoot": "",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": [
-      "es2017",
-      "dom"
-    ],
-    "outDir": "lib",
-    "skipLibCheck": true,
-    "rootDir": "."
-  },
-  "angularCompilerOptions": {
-    "enableIvy": false,
-    "disableTypeScriptVersionCheck": true,
-    "genDir": "./app/ngfactory",
-    "entryModule": "app/app.module#AppModule"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-server-app/webpack.config.js
deleted file mode 100644
index 2905841b3e54..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/webpack.config.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const { AngularCompilerPlugin, PLATFORM } = require('@ngtools/webpack');
-const path = require('path');
-
-module.exports = {
-  resolve: {
-    extensions: ['.ts', '.js']
-  },
-  target: 'web',
-  entry: './app/main.ts',
-  output: {
-    path: path.resolve('./dist'),
-    publicPath: 'dist/',
-    filename: 'app.main.js'
-  },
-  plugins: [
-    new AngularCompilerPlugin({
-      tsConfigPath: './tsconfig.json',
-      mainPath: './app/main.ts',
-      platform: PLATFORM.Server
-    })
-  ],
-  module: {
-    rules: [
-      { test: /\.scss$/, loaders: ['raw-loader', 'sass-loader'] },
-      { test: /\.css$/, loader: 'raw-loader' },
-      { test: /\.html$/, loader: 'raw-loader' },
-      { test: /\.ts$/, loader: '@ngtools/webpack' }
-    ]
-  },
-  devServer: {
-    historyApiFallback: true
-  }
-};
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index cf921f6acaf4..02c9c34b4093 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,20 +2,20 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#d7211d9f315301bf0e237fca12332467e5ca19fc",
-    "@angular/cdk": "github:angular/cdk-builds#5da9a70c8c4bef3aa72d3cc60542f7d27b11755f",
-    "@angular/common": "github:angular/common-builds#5bb0796a231844b8d866eb770d8abec73fb08c76",
-    "@angular/compiler": "github:angular/compiler-builds#fce2321ac8a499a7a6b1d1d7dcd56ef49a9009d1",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#df710e62178f8dab73cce7c76b5e58c604ebd269",
-    "@angular/core": "github:angular/core-builds#f13a26357ea9838f4ef69349bc5e46c5a1ffdb48",
-    "@angular/forms": "github:angular/forms-builds#b63c485ad5f80ced2890c57c6cf1204559089cfb",
-    "@angular/language-service": "github:angular/language-service-builds#97f03c2e54388bb910b081ef926afef9631919d5",
-    "@angular/localize": "github:angular/localize-builds#71ab1a7f7e7a2ed0706b475f17c1e2e64ce7feed",
-    "@angular/material": "github:angular/material2-builds#dc8679b02136df3f3e6f79f8e4d8f4eb742e3eb7",
-    "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#449c551655484aaebcfc23880ca765388469ba95",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#4ae889ff1a5730712b8c285e5bdea33b05b3b888",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#94b9c714d31d3ca58fcb0a858ca446db31c74385",
-    "@angular/platform-server": "github:angular/platform-server-builds#39b8265f55c63bfc437a980613e839aa02575751",
-    "@angular/router": "github:angular/router-builds#cdc79fad2e81ba7b7aa36e828db464c0348e907d"
+    "@angular/animations": "github:angular/animations-builds#b588c27d49783b62e359cd789c1f1fbb85ddf0d7",
+    "@angular/cdk": "github:angular/cdk-builds#691f7f00e5931a2fc059b8f846f39eac996ff525",
+    "@angular/common": "github:angular/common-builds#c2c767b15c1e326e9be0e719bd9817cda0117d66",
+    "@angular/compiler": "github:angular/compiler-builds#1e50cd406f1c00448bbc42fe00701add35421da6",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#7d8f45d036caffdbf13a0bad12256ee27ad2d459",
+    "@angular/core": "github:angular/core-builds#976205ce44146b22bf8127c3012d8a5b2ed65f41",
+    "@angular/forms": "github:angular/forms-builds#e0ad4061a1027300d5286cc0d58920ed4ca17ada",
+    "@angular/language-service": "github:angular/language-service-builds#1e6d457ec88939fc93181f33339840cd15c8ace5",
+    "@angular/localize": "github:angular/localize-builds#fbd7b397d08937dfa5ff3bef5c688cae08246267",
+    "@angular/material": "github:angular/material2-builds#e2ee4bd3e96a8dd1a00f02d8a243a77227fb7ea7",
+    "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#36fcbe487de5d9093131894ea527efaef9b35593",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#1f232e7c592c56d2b60e052024fc0e984ea9eec6",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#95403d4b9dda69055816126c66ce2a973e8677b7",
+    "@angular/platform-server": "github:angular/platform-server-builds#313900499eb39fb5e498509f6e2bd0b767c027b9",
+    "@angular/router": "github:angular/router-builds#e0ade3ea024da576069ae55bf18deae8944c9025"
   }
 }
diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
index 9ab6d4ee49e9..6b2fe88c636a 100644
--- a/tests/legacy-cli/e2e/setup/010-local-publish.ts
+++ b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -1,24 +1,80 @@
-import { prerelease } from 'semver';
-import { packages } from '../../../../lib/packages';
-import { npm } from '../utils/process';
+import { getGlobalVariable } from '../utils/env';
+import { npm, silentNpm } from '../utils/process';
+import { isPrereleaseCli } from '../utils/project';
 
-export default async function() {
-  const publishArgs = [
+async function publishLocal(specifier: string, tags: string[], registry: string): Promise<void> {
+  const { stdout: stdoutPack1 } = await silentNpm(
+    'pack',
+    specifier,
+    '--registry=https://registry.npmjs.org',
+  );
+  for (const tag of tags) {
+    await silentNpm('publish', stdoutPack1.trim(), `--registry=${registry}`, `--tag=${tag}`);
+  }
+}
+
+export default async function () {
+  const testRegistry = getGlobalVariable('package-registry');
+  await npm(
     'run',
     'admin',
     '--',
     'publish',
     '--no-versionCheck',
     '--no-branchCheck',
-    '--registry=http://localhost:4873',
+    `--registry=${testRegistry}`,
+    '--tag',
+    isPrereleaseCli() ? 'next' : 'latest',
+  );
+
+  const basePackages = [
+    '@angular/cli',
+    '@angular-devkit/architect',
+    '@angular-devkit/build-angular',
+    '@angular-devkit/build-optimizer',
+    '@angular-devkit/build-webpack',
+    '@angular-devkit/core',
+    '@angular-devkit/schematics',
+    '@ngtools/webpack',
+    '@schematics/angular',
+    '@schematics/update',
   ];
 
-  const pre = prerelease(packages['@angular/cli'].version);
-  if (pre && pre.length > 0) {
-    publishArgs.push('--tag', 'next');
-  } else {
-    publishArgs.push('--tag', 'latest');
+  const ltsVersions = {
+    '8': [...basePackages],
+    '9': [...basePackages],
+    '10': [...basePackages],
+  };
+  for (const [ltsVersion, ltsPackages] of Object.entries(ltsVersions)) {
+    const tag = `v${ltsVersion}-lts`;
+
+    for (const packageName of ltsPackages) {
+      await publishLocal(
+        `${packageName}@${tag}`,
+        [tag],
+        testRegistry,
+      );
+    }
   }
 
-  await npm(...publishArgs);
+  const v8OriginalPackages = [
+    '@angular/cli@8.0',
+    '@angular-devkit/architect@0.800',
+    '@angular-devkit/build-angular@0.800',
+    '@angular-devkit/build-optimizer@0.800',
+    '@angular-devkit/build-webpack@0.800',
+    '@angular-devkit/core@8.0',
+    '@angular-devkit/schematics@8.0',
+    '@ngtools/webpack@8.0.6',
+    '@schematics/angular@8.0',
+    '@schematics/update@0.800',
+  ];
+
+  for (const fullPackageSpecifier of v8OriginalPackages) {
+    await publishLocal(
+      fullPackageSpecifier,
+      ['v8-original'],
+      testRegistry,
+    );
+  }
 }
diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/legacy-cli/e2e/setup/100-global-cli.ts
index 21ed8749789c..8c7a1d151b05 100644
--- a/tests/legacy-cli/e2e/setup/100-global-cli.ts
+++ b/tests/legacy-cli/e2e/setup/100-global-cli.ts
@@ -7,12 +7,14 @@ export default async function() {
     return;
   }
 
+  const testRegistry = getGlobalVariable('package-registry');
+
   // Install global Angular CLI.
   await silentNpm(
     'install',
     '--global',
     '@angular/cli',
-    '--registry=http://localhost:4873',
+    `--registry=${testRegistry}`,
   );
 
   try {
diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index c166b8e122de..44097dbba61a 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -1,8 +1,8 @@
 import { join } from 'path';
 import { getGlobalVariable } from '../utils/env';
-import { expectFileToExist } from '../utils/fs';
+import { expectFileToExist, writeFile } from '../utils/fs';
 import { gitClean } from '../utils/git';
-import { ng } from '../utils/process';
+import { ng, npm } from '../utils/process';
 import { prepareProjectForE2e, updateJsonFile } from '../utils/project';
 
 export default async function() {
@@ -17,11 +17,29 @@ export default async function() {
     await gitClean();
   } else {
     const extraArgs = [];
+    const testRegistry = getGlobalVariable('package-registry');
+    const isCI = getGlobalVariable('ci');
+
+    // Ensure local test registry is used when outside a project
+    if (isCI) {
+      // Safe to set a user configuration on CI
+      await npm('config', 'set', 'registry', testRegistry);
+    } else {
+      // Yarn does not use the environment variable so an .npmrc file is also required
+      await writeFile('.npmrc', `registry=${testRegistry}`);
+      process.env['NPM_CONFIG_REGISTRY'] = testRegistry;
+    }
 
     await ng('new', 'test-project', '--skip-install', ...extraArgs);
     await expectFileToExist(join(process.cwd(), 'test-project'));
     process.chdir('./test-project');
 
+    // If on CI, the user configuration set above will handle project usage
+    if (!isCI) {
+      // Ensure local test registry is used inside a project
+      await writeFile('.npmrc', `registry=${testRegistry}`);
+    }
+
     if (argv['ve']) {
       await updateJsonFile('tsconfig.json', config => {
         const { angularCompilerOptions = {} } = config;
diff --git a/tests/legacy-cli/e2e/tests/basic/build.ts b/tests/legacy-cli/e2e/tests/basic/build.ts
index 824a2723c41d..fee2be7abcf5 100644
--- a/tests/legacy-cli/e2e/tests/basic/build.ts
+++ b/tests/legacy-cli/e2e/tests/basic/build.ts
@@ -1,4 +1,4 @@
-import { expectFileToMatch } from '../../utils/fs';
+import { expectFileToMatch, replaceInFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 
 
@@ -12,8 +12,42 @@ export default async function() {
   await ng('build', 'test-project', '--no-progress');
   await ng('build', '--no-progress', 'test-project');
 
+  // Enable Differential loading to run both size checks
+  await replaceInFile(
+    '.browserslistrc',
+    'not IE 11',
+    'IE 11',
+  );
   // 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');
+  const { stderr: stderrProgress, stdout } = await ng('build', '--prod', '--progress');
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.[a-zA-Z0-9]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.[a-zA-Z0-9]{20}\.js/);
+
+  if (!stdout.includes('Initial ES5 Total')) {
+    throw new Error(`Expected stdout not to contain 'Initial ES5 Total' but it did.\n${stdout}`);
+  }
+
+  if (!stdout.includes('Initial ES2015 Total')) {
+    throw new Error(`Expected stdout not to contain 'Initial ES2015 Total' but it did.\n${stdout}`);
+  }
+
+  const logs: string[] = [
+    'Browser application bundle generation complete',
+    'ES5 bundle generation complete',
+    'Copying assets complete',
+    'Index html generation complete',
+  ];
+
+  for (const log of logs) {
+    if (!stderrProgress.includes(log)) {
+      throw new Error(`Expected stderr to contain '${log}' but didn't.\n${stderrProgress}`);
+    }
+  }
+
+  const { stderr: stderrNoProgress } = await ng('build', '--prod', '--no-progress');
+  for (const log of logs) {
+    if (stderrNoProgress.includes(log)) {
+      throw new Error(`Expected stderr not to contain '${log}' but it did.\n${stderrProgress}`);
+    }
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/e2e.ts b/tests/legacy-cli/e2e/tests/basic/e2e.ts
index 8f7ef2de0569..e21a8ccb0428 100644
--- a/tests/legacy-cli/e2e/tests/basic/e2e.ts
+++ b/tests/legacy-cli/e2e/tests/basic/e2e.ts
@@ -1,26 +1,13 @@
-// TODO(architect): edit the architect config instead of the cli config.
-
 import {
   ng,
-  npm,
   execAndWaitForOutputToMatch,
   killAllProcesses
 } from '../../utils/process';
-import {updateJsonFile} from '../../utils/project';
 import {expectToFail} from '../../utils/utils';
 import {moveFile, copyFile, replaceInFile} from '../../utils/fs';
 
 export default function () {
-  // Should fail without updated webdriver
-  return updateJsonFile('package.json', packageJson => {
-    // Add to npm scripts to make running the binary compatible with Windows
-    const scripts = packageJson['scripts'];
-    scripts['wd:clean'] = 'webdriver-manager clean';
-  })
-    .then(() => npm('run', 'wd:clean'))
-    .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'))
+  return Promise.resolve()
     // Should fail without serving
     .then(() => expectToFail(() => ng('e2e', 'test-project', '--devServerTarget=')))
     // These should work.
@@ -59,9 +46,12 @@ export default function () {
     ))
     // Should run side-by-side with `ng serve`
     .then(() => execAndWaitForOutputToMatch('ng', ['serve'],
-      /: Compiled successfully./))
+      / Compiled successfully./))
     .then(() => ng('e2e', 'test-project', '--devServerTarget='))
-    .then(() => killAllProcesses(), (err: any) => {
+    // Should fail without updated webdriver
+    .then(() => replaceInFile('e2e/protractor.conf.js', /chromeDriver: String.raw`[^`]*`,/, ''))
+    .then(() => expectToFail(() => ng('e2e', 'test-project', '--no-webdriver-update', '--devServerTarget=')))
+    .then(() => killAllProcesses(), (err) => {
       killAllProcesses();
       throw err;
     });
diff --git a/tests/legacy-cli/e2e/tests/build/environment.ts b/tests/legacy-cli/e2e/tests/basic/environment.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/environment.ts
rename to tests/legacy-cli/e2e/tests/basic/environment.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/ivy-opt-out.ts b/tests/legacy-cli/e2e/tests/basic/ivy-opt-out.ts
index 5c6e0c913dc9..eb6ebfb0577b 100644
--- a/tests/legacy-cli/e2e/tests/basic/ivy-opt-out.ts
+++ b/tests/legacy-cli/e2e/tests/basic/ivy-opt-out.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/basic/ivy.ts b/tests/legacy-cli/e2e/tests/basic/ivy.ts
index fc5a42a594ef..aa021802d233 100644
--- a/tests/legacy-cli/e2e/tests/basic/ivy.ts
+++ b/tests/legacy-cli/e2e/tests/basic/ivy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -38,9 +38,7 @@ export default async function() {
     }
 
     // Verify it's Ivy.
-    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);
+    const main = await request('http://localhost:4200/main.js');
 
     if (!main.match(/ɵcmp\s*=/) && !main.match(/\\u0275cmp\s*=/)) {
       throw new Error('Ivy could not be found.');
diff --git a/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.ts b/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.ts
index fb6996319467..8ad6fec5bd92 100644
--- a/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.ts
+++ b/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 8f2ef17dae99..29a423b9deb6 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -8,7 +8,7 @@ import {writeFile, writeMultipleFiles} from '../../utils/fs';
 import {wait} from '../../utils/utils';
 import {request} from '../../utils/http';
 
-const validBundleRegEx = /: Compiled successfully./;
+const validBundleRegEx = / Compiled successfully./;
 
 export default function() {
   return execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
@@ -44,7 +44,7 @@ export default function() {
           bootstrap: [AppComponent]
         })
         export class AppModule { }
-      `)
+      `),
     ]))
     // Count the bundles.
     .then((results) => {
@@ -79,7 +79,7 @@ export default function() {
           console.log('$$_E2E_GOLDEN_VALUE_1');
           export let X = '$$_E2E_GOLDEN_VALUE_2';
         `,
-          'src/main.ts': `
+        'src/main.ts': `
           import { enableProdMode } from '@angular/core';
           import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
@@ -95,8 +95,8 @@ export default function() {
           import * as m from './app/app.module';
           console.log(m.X);
           console.log('$$_E2E_GOLDEN_VALUE_3');
-        `
-      })
+        `,
+      }),
     ]))
     .then(() => Promise.all([
       waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
@@ -139,6 +139,32 @@ export default function() {
         throw new Error('Expected golden value 3.');
       }
     })
+    .then(() => Promise.all([
+      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
+      writeMultipleFiles({
+        'src/app/app.component.html': '<h1>testingTESTING123</h1>',
+      }),
+    ]))
+    .then(() => wait(2000))
+    .then(() => request('http://localhost:4200/main.js'))
+    .then((body) => {
+      if (!body.match(/testingTESTING123/)) {
+        throw new Error('Expected component HTML to update.');
+      }
+    })
+    .then(() => Promise.all([
+      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
+      writeMultipleFiles({
+        'src/app/app.component.css': ':host { color: blue; }',
+      }),
+    ]))
+    .then(() => wait(2000))
+    .then(() => request('http://localhost:4200/main.js'))
+    .then((body) => {
+      if (!body.match(/color:\s?blue/)) {
+        throw new Error('Expected component CSS to update.');
+      }
+    })
     .then(() => killAllProcesses(), (err: unknown) => {
       killAllProcesses();
       throw err;
diff --git a/tests/legacy-cli/e2e/tests/basic/serve.ts b/tests/legacy-cli/e2e/tests/basic/serve.ts
new file mode 100644
index 000000000000..03457450cae8
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/basic/serve.ts
@@ -0,0 +1,26 @@
+import { request } from '../../utils/http';
+import { killAllProcesses } from '../../utils/process';
+import { ngServe } from '../../utils/project';
+
+export default async function () {
+  try {
+    // Serve works without HMR
+    await ngServe('--no-hmr');
+    await verifyResponse();
+    killAllProcesses();
+
+    // Serve works with HMR
+    await ngServe('--hmr');
+    await verifyResponse();
+  } finally {
+    killAllProcesses();
+  }
+}
+
+async function verifyResponse(): Promise<void> {
+  const response = await request('http://localhost:4200/');
+
+  if (!/<app-root><\/app-root>/.test(response)) {
+    throw new Error('Response does not match expected value.');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/build/aot/aot-decorators.ts b/tests/legacy-cli/e2e/tests/build/aot/aot-decorators.ts
deleted file mode 100644
index c6d56342e2b0..000000000000
--- a/tests/legacy-cli/e2e/tests/build/aot/aot-decorators.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {ng} from '../../../utils/process';
-import {appendToFile, expectFileToMatch, prependToFile, replaceInFile} from '../../../utils/fs';
-import {expectToFail} from '../../../utils/utils';
-import {ngVersionMatches} from '../../../utils/version';
-
-export default function() {
-  // TODO(architect): This behaviour seems to have changed in devkit/build-angular. Figure out why.
-  return;
-
-  return ng('generate', 'component', 'test-component', '--module', 'app.module.ts')
-    .then(() => prependToFile('src/app/test-component/test-component.component.ts', `
-      import { Optional, SkipSelf } from '@angular/core';
-    `))
-    .then(() => replaceInFile('src/app/test-component/test-component.component.ts',
-      /constructor.*/, `
-        constructor(@Optional() @SkipSelf() public test: TestComponentComponent) {
-          console.log(test);
-        }
-      `))
-    .then(() => appendToFile('src/app/app.component.html', `
-      <app-test-component></app-test-component>
-    `))
-    .then(() => ng('build', '--aot'))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main.js', /\bComponent\b/)))
-    // Check that the decorators are still kept.
-    .then(() => expectFileToMatch('dist/test-project/main.js', /ctorParameters.*Optional.*SkipSelf/))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main.js', /\bNgModule\b/)));
-}
diff --git a/tests/legacy-cli/e2e/tests/build/assets.ts b/tests/legacy-cli/e2e/tests/build/assets.ts
new file mode 100644
index 000000000000..915138288059
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/assets.ts
@@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import { expectFileToExist, expectFileToMatch, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
+
+export default async function () {
+  await writeFile('src/assets/.file', '');
+  await writeFile('src/assets/test.abc', 'hello world');
+
+  await ng('build');
+
+  await expectFileToExist('dist/test-project/favicon.ico');
+  await expectFileToExist('dist/test-project/assets/.file');
+  await expectFileToMatch('dist/test-project/assets/test.abc', 'hello world');
+  await expectToFail(() => expectFileToExist('dist/test-project/assets/.gitkeep'));
+
+  // Ensure `followSymlinks` option follows symlinks
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect['build'].options.assets = [{ glob: '**/*', input: 'src/assets', output: 'assets', followSymlinks: true }];
+  });
+  fs.mkdirSync('dirToSymlink/subdir1', { recursive: true });
+  fs.mkdirSync('dirToSymlink/subdir2/subsubdir1', { recursive: true });
+  fs.writeFileSync('dirToSymlink/a.txt', '');
+  fs.writeFileSync('dirToSymlink/subdir1/b.txt', '');
+  fs.writeFileSync('dirToSymlink/subdir2/c.txt', '');
+  fs.writeFileSync('dirToSymlink/subdir2/subsubdir1/d.txt', '');
+  fs.symlinkSync(process.cwd() + '/dirToSymlink', 'src/assets/symlinkDir');
+
+  await ng('build');
+
+  await expectFileToExist('dist/test-project/assets/symlinkDir/a.txt');
+  await expectFileToExist('dist/test-project/assets/symlinkDir/subdir1/b.txt');
+  await expectFileToExist('dist/test-project/assets/symlinkDir/subdir2/c.txt');
+  await expectFileToExist('dist/test-project/assets/symlinkDir/subdir2/subsubdir1/d.txt');
+}
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
index f5846a533b9f..9f31e320f469 100644
--- a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
+++ b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -10,70 +10,40 @@ import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-// tslint:disable:max-line-length
-export default function () {
-  const budgetConfigs = [
-    {
-      expectation: 'pass',
-      message: 'BIG max for all, should not error',
-      budget: { type: 'allScript', maximumError: '100mb' },
-    },
-    {
-      expectation: 'error',
-      message: 'Budget error: all, max error',
-      budget: { type: 'all', maximumError: '100b' },
-    },
-    {
-      expectation: 'warning',
-      message: 'Budget warning: all, min warning',
-      budget: { type: 'all', minimumWarning: '100mb' },
-    },
-  ];
+export default async function () {
+  // Error
+  await updateJsonFile('angular.json', json => {
+    json.projects['test-project'].architect.build.options.budgets = [
+      { type: 'all', maximumError: '100b' },
+    ];
+  });
+
+  const errorMessage = await expectToFail(() => ng('build'));
+  if (!/Error.+budget/.test(errorMessage)) {
+    throw new Error('Budget error: all, max error.');
+  }
 
-  const promiseFactories = budgetConfigs.map(cfg => {
-    if (cfg.expectation === 'error') {
-      return () => {
-        return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
-          })
-          .then(() => expectToFail(() => ng('build', '--optimization')))
-          .then(errorMessage => {
-            if (!/Error.+budgets/.test(errorMessage)) {
-              throw new Error(cfg.message);
-            }
-          });
-      };
-    } else if (cfg.expectation === 'warning') {
-      return () => {
-        return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
-          })
-          .then(() => ng('build', '--optimization'))
-          .then(({ stderr }) => {
-            if (!/Warning.+budgets/.test(stderr)) {
-              throw new Error(cfg.message);
-            }
-          });
-      };
-    } else { // pass
-      return () => {
-        return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
-          })
-          .then(() => ng('build', '--optimization'))
-          .then(({ stderr }) => {
-            if (/(Warning|Error)/.test(stderr)) {
-              throw new Error(cfg.message);
-            }
-          });
-      };
-    }
+  // Warning
+  await updateJsonFile('angular.json', json => {
+    json.projects['test-project'].architect.build.options.budgets = [
+      { type: 'all', minimumWarning: '100mb' },
+    ];
   });
 
-  let promiseChain = Promise.resolve();
-  for (let i = 0; i < promiseFactories.length; i++) {
-    promiseChain = promiseChain.then(promiseFactories[i]);
+  const { stderr } = await ng('build');
+  if (!/Warning.+budget/.test(stderr)) {
+    throw new Error('Budget warning: all, min warning');
   }
 
-  return promiseChain;
+  // Pass
+  await updateJsonFile('angular.json', json => {
+    json.projects['test-project'].architect.build.options.budgets = [
+      { type: 'allScript', maximumError: '100mb' },
+    ];
+  });
+
+  const { stderr: stderr2 } = await ng('build');
+  if (/(Warning|Error)/.test(stderr2)) {
+    throw new Error('BIG max for all, should not error');
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts b/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
new file mode 100644
index 000000000000..ab14256fbedd
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
@@ -0,0 +1,73 @@
+import { createHash } from 'crypto';
+import {
+  appendToFile,
+  expectFileToMatch,
+  prependToFile,
+  readFile,
+  replaceInFile,
+  writeFile,
+} from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+export default async function () {
+  // Enable Differential loading
+  await replaceInFile('.browserslistrc', 'not IE 11', 'IE 11');
+
+  const appRoutingModulePath = 'src/app/app-routing.module.ts';
+
+  // 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>');
+
+  await ng('generate', 'module', 'lazy', '--module=app.module', '--route', 'lazy');
+
+  await ng(
+    'build',
+    '--prod',
+    '--subresource-integrity',
+    '--output-hashing=none',
+    '--output-path=dist/first',
+  );
+
+  // Second build used to ensure cached files use correct integrity values
+  await ng(
+    'build',
+    '--prod',
+    '--subresource-integrity',
+    '--output-hashing=none',
+    '--output-path=dist/second',
+  );
+
+  const codeHashES5 = createHash('sha384')
+    .update(await readFile('dist/first/5-es5.js'))
+    .digest('base64');
+  const codeHashES2015 = createHash('sha384')
+    .update(await readFile('dist/first/5-es2015.js'))
+    .digest('base64');
+
+  await expectFileToMatch('dist/first/runtime-es5.js', 'sha384-' + codeHashES5);
+  await expectFileToMatch('dist/first/runtime-es2015.js', 'sha384-' + codeHashES2015);
+
+  await expectFileToMatch('dist/second/runtime-es5.js', 'sha384-' + codeHashES5);
+  await expectFileToMatch('dist/second/runtime-es2015.js', 'sha384-' + codeHashES2015);
+}
diff --git a/tests/legacy-cli/e2e/tests/build/differential-loading-watch.ts b/tests/legacy-cli/e2e/tests/build/differential-loading-watch.ts
new file mode 100644
index 000000000000..6c60d6328f5a
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/differential-loading-watch.ts
@@ -0,0 +1,14 @@
+import { expectFileToExist, replaceInFile } from '../../utils/fs';
+import { execAndWaitForOutputToMatch } from '../../utils/process';
+
+export default async function () {
+  await replaceInFile(
+    '.browserslistrc',
+    'not IE 11',
+    'IE 11',
+  );
+
+  await execAndWaitForOutputToMatch('ng', ['build', '--watch'], /Initial Total/i);
+  await expectFileToExist('dist/test-project/runtime-es2015.js');
+  await expectFileToExist('dist/test-project/main-es2015.js');
+}
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 8426c8a354d0..f9313f936838 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/build/material.ts b/tests/legacy-cli/e2e/tests/build/material.ts
index 4ee43b0f5a30..b4c4c8ee6650 100644
--- a/tests/legacy-cli/e2e/tests/build/material.ts
+++ b/tests/legacy-cli/e2e/tests/build/material.ts
@@ -28,7 +28,7 @@ export default async function () {
 
     await installWorkspacePackages();
   } else {
-    await installPackage('@angular/material-moment-adapter');
+    await installPackage('@angular/material-moment-adapter@11');
   }
 
   await installPackage('moment');
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 1d0e99282019..91ab3b233414 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -1,9 +1,9 @@
 import { normalize } from 'path';
 import { getGlobalVariable } from '../../utils/env';
-import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
+import { appendToFile, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
 import { installPackage } from '../../utils/packages';
-import { exec, ng, silentNpm } from '../../utils/process';
-import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
+import { exec, ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
 
 const snapshots = require('../../ng-snapshot/package.json');
 
@@ -11,18 +11,7 @@ export default async function () {
   const argv = getGlobalVariable('argv');
   const veEnabled = argv['ve'];
 
-  // @nguniversal/express-engine currently relies on ^0.1000.0 of @angular-devkit/architect
-  // which is not present in the local package registry and not semver compatible with 0.1001.0+
-  const { stdout: stdout1 } = await silentNpm('pack', '@angular-devkit/architect@0.1001', '--registry=https://registry.npmjs.org');
-  await silentNpm('publish', stdout1.trim(), '--registry=http://localhost:4873', '--tag=minor');
-
-  // @nguniversal/express-engine currently relies on ^10.0.0 of @angular-devkit/core
-  // which is not present in the local package registry and not semver compatible prerelease version of 10.1.0
-  const { stdout: stdout2 } = await silentNpm('pack', '@angular-devkit/core@10.1', '--registry=https://registry.npmjs.org');
-  await silentNpm('publish', stdout2.trim(), '--registry=http://localhost:4873', '--tag=minor');
-
-  const tag = (await isPrereleaseCli()) ? 'next' : 'latest';
-  await ng('add', `@nguniversal/express-engine@${tag}`);
+  await ng('generate', 'universal', '--client-project', 'test-project');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
   if (isSnapshotBuild) {
@@ -82,6 +71,8 @@ export default async function () {
     );
   }
 
+  await replaceInFile('tsconfig.server.json', 'src/main.server.ts', 'server.ts');
+  await replaceInFile('angular.json', 'src/main.server.ts', 'server.ts');
 
   await ng('run', 'test-project:server:production', '--optimization', 'false');
 
diff --git a/tests/legacy-cli/e2e/tests/build/poll.ts b/tests/legacy-cli/e2e/tests/build/poll.ts
index e2aacf46f586..9a63d5edb1c2 100644
--- a/tests/legacy-cli/e2e/tests/build/poll.ts
+++ b/tests/legacy-cli/e2e/tests/build/poll.ts
@@ -6,7 +6,7 @@ import {
 import { ngServe } from '../../utils/project';
 import { expectToFail, wait } from '../../utils/utils';
 
-const webpackGoodRegEx = /: Compiled successfully./;
+const webpackGoodRegEx = / Compiled successfully./;
 
 export default async function() {
   try {
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 739e946bd8ff..952220ec662e 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts
@@ -6,7 +6,7 @@ import {
 import {appendToFile} from '../../utils/fs';
 import {getGlobalVariable} from '../../utils/env';
 
-const webpackGoodRegEx = /: Compiled successfully./;
+const webpackGoodRegEx = / Compiled successfully./;
 
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
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 57f051357200..a4942e1d0d99 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
@@ -7,7 +7,7 @@ import {writeFile, prependToFile, appendToFile} from '../../utils/fs';
 
 
 const doneRe =
-  /: Compiled successfully.|: Failed to compile./;
+  / Compiled successfully.|: Failed to compile./;
 const errorRe = /Error/;
 
 
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
index ac5070a29e40..2aeb84e291d0 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
@@ -9,7 +9,7 @@ import { wait, expectToFail } from '../../utils/utils';
 
 
 const failedRe = /: Failed to compile/;
-const successRe = /: Compiled successfully/;
+const successRe = / Compiled successfully/;
 const errorRe = /ERROR in/;
 const extraErrors = [
   `Final loader didn't return a Buffer or String`,
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
index 1828ca8efaf7..d87d343d2256 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
@@ -6,7 +6,7 @@ import {
 import { appendToFile, writeMultipleFiles, replaceInFile, expectFileToMatch } from '../../utils/fs';
 import { getGlobalVariable } from '../../utils/env';
 
-const validBundleRegEx = /: Compiled successfully./;
+const validBundleRegEx = / Compiled successfully./;
 
 export default function () {
   // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index b38df33587b7..12b4428cd142 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -1,4 +1,3 @@
-import { getGlobalVariable } from '../../utils/env';
 import { appendToFile } from '../../utils/fs';
 import {
   execAndWaitForOutputToMatch,
@@ -7,7 +6,7 @@ import {
 } from '../../utils/process';
 import { wait } from '../../utils/utils';
 
-const webpackGoodRegEx = /: Compiled successfully./;
+const webpackGoodRegEx = / Compiled successfully./;
 
 export default async function() {
   if (process.platform.startsWith('win')) {
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
index 4056dee0b802..90d1bc4c2eff 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
@@ -7,7 +7,7 @@ import { writeFile, prependToFile } from '../../utils/fs';
 import {getGlobalVariable} from '../../utils/env';
 
 
-const successRe = /: Compiled successfully/;
+const successRe = / Compiled successfully/;
 
 export default async function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
diff --git a/tests/legacy-cli/e2e/tests/build/rollup.ts b/tests/legacy-cli/e2e/tests/build/rollup.ts
index 8b480092b64a..ab87f8990307 100644
--- a/tests/legacy-cli/e2e/tests/build/rollup.ts
+++ b/tests/legacy-cli/e2e/tests/build/rollup.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/build/sourcemap.ts b/tests/legacy-cli/e2e/tests/build/sourcemap.ts
index d296c17405bc..b78bb85eb99f 100644
--- a/tests/legacy-cli/e2e/tests/build/sourcemap.ts
+++ b/tests/legacy-cli/e2e/tests/build/sourcemap.ts
@@ -15,10 +15,10 @@ export default async function () {
   await ng('build', '--output-hashing=bundles', '--source-map');
 
   await ng('build', '--prod', '--output-hashing=none', '--source-map');
-  await testForSourceMaps(5);
+  await testForSourceMaps(6);
 
   await ng('build', '--output-hashing=none', '--source-map');
-  await testForSourceMaps(6);
+  await testForSourceMaps(8);
 }
 
 async function testForSourceMaps(expectedNumberOfFiles: number): Promise <void> {
@@ -29,7 +29,7 @@ async function testForSourceMaps(expectedNumberOfFiles: number): Promise <void>
 
   let count = 0;
   for (const file of files) {
-    if (!file.endsWith('.js') || file.startsWith('vendor-')) {
+    if (!file.endsWith('.js')) {
       continue;
     }
 
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 bbdf53c52a6d..d26de1206084 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
@@ -6,7 +6,7 @@ import {
 } from '../../../utils/fs';
 import { installWorkspacePackages } from '../../../utils/packages';
 import { ng } from '../../../utils/process';
-import { updateJsonFile } from '../../../utils/project';
+import { isPrereleaseCli, updateJsonFile } from '../../../utils/project';
 
 const snapshots = require('../../../ng-snapshot/package.json');
 
@@ -14,10 +14,12 @@ export default async function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
+  const tag = await isPrereleaseCli() ?  'next' : 'latest';
+
   await updateJsonFile('package.json', packageJson => {
     const dependencies = packageJson['dependencies'];
-    dependencies['@angular/material'] = isSnapshotBuild ? snapshots.dependencies['@angular/material'] : 'latest';
-    dependencies['@angular/cdk'] = isSnapshotBuild ? snapshots.dependencies['@angular/cdk'] : 'latest';
+    dependencies['@angular/material'] = isSnapshotBuild ? snapshots.dependencies['@angular/material'] : tag;
+    dependencies['@angular/cdk'] = isSnapshotBuild ? snapshots.dependencies['@angular/cdk'] : tag;
   });
 
   await installWorkspacePackages();
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 cedd8378360d..3c8bb410fa19 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
@@ -33,7 +33,7 @@ export default async function () {
   await silentExec('rm', '-rf', 'node_modules/sass');
   await expectToFail(() => ng('build', '--extract-css', '--source-map'));
 
-  await installPackage('node-sass');
+  await installPackage('node-sass@5');
   await silentExec('rm', '-rf', 'node_modules/sass');
   await ng('build', '--extract-css', '--source-map');
 
diff --git a/tests/legacy-cli/e2e/tests/build/styles/symlinked-global.ts b/tests/legacy-cli/e2e/tests/build/styles/symlinked-global.ts
new file mode 100644
index 000000000000..3185b1a5839a
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/styles/symlinked-global.ts
@@ -0,0 +1,33 @@
+import { symlinkSync } from 'fs';
+import { resolve } from 'path';
+import { expectFileToMatch, writeMultipleFiles } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+import { updateJsonFile } from '../../../utils/project';
+
+export default async function () {
+  await writeMultipleFiles({
+    'src/styles.scss': `p { color: red }`,
+    'src/styles-for-link.scss': `p { color: blue }`,
+  });
+
+  symlinkSync(
+    resolve('src/styles-for-link.scss'),
+    resolve('src/styles-linked.scss'),
+  );
+
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect.build.options.styles = [
+      'src/styles.scss',
+      'src/styles-linked.scss',
+    ];
+  });
+
+  await ng('build');
+  await expectFileToMatch('dist/test-project/styles.css', 'red');
+  await expectFileToMatch('dist/test-project/styles.css', 'blue');
+
+  await ng('build', '--preserve-symlinks');
+  await expectFileToMatch('dist/test-project/styles.css', 'red');
+  await expectFileToMatch('dist/test-project/styles.css', 'blue');
+}
diff --git a/tests/legacy-cli/e2e/tests/build/styles/tailwind.ts b/tests/legacy-cli/e2e/tests/build/styles/tailwind.ts
new file mode 100644
index 000000000000..00818606c932
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/styles/tailwind.ts
@@ -0,0 +1,60 @@
+import { deleteFile, expectFileToMatch, writeFile } from '../../../utils/fs';
+import { installPackage, uninstallPackage } from '../../../utils/packages';
+import { ng, silentExec } from '../../../utils/process';
+import { expectToFail } from '../../../utils/utils';
+
+export default async function () {
+  // Tailwind is not supported in Node.js 10
+  if (process.version.startsWith('v10')) {
+    return;
+  }
+
+  // Install Tailwind
+  await installPackage('tailwindcss');
+
+  // Create configuration file
+  await silentExec('npx', 'tailwindcss', 'init');
+
+  // Add Tailwind directives to a component style
+  await writeFile('src/app/app.component.css', '@tailwind base; @tailwind components;');
+
+  // Add Tailwind directives to a global style
+  await writeFile('src/styles.css', '@tailwind base; @tailwind components;');
+
+  // Build should succeed and process Tailwind directives
+  await ng('build');
+
+  // Check for Tailwind output
+  await expectFileToMatch('dist/test-project/styles.css', /::placeholder/);
+  await expectFileToMatch('dist/test-project/main.js', /::placeholder/);
+  await expectToFail(() =>
+    expectFileToMatch('dist/test-project/styles.css', '@tailwind base; @tailwind components;'),
+  );
+  await expectToFail(() =>
+    expectFileToMatch('dist/test-project/main.js', '@tailwind base; @tailwind components;'),
+  );
+
+  // Remove configuration file
+  await deleteFile('tailwind.config.js');
+
+  // Ensure Tailwind is disabled when no configuration file is present
+  await ng('build');
+  await expectFileToMatch('dist/test-project/styles.css', '@tailwind base; @tailwind components;');
+  await expectFileToMatch('dist/test-project/main.js', '@tailwind base; @tailwind components;');
+
+  // Recreate configuration file
+  await silentExec('npx', 'tailwindcss', 'init');
+
+  // Uninstall Tailwind
+  await uninstallPackage('tailwindcss');
+
+  // Ensure installation warning is present
+  const { stderr } = await ng('build');
+  if (!stderr.includes("To enable Tailwind CSS, please install the 'tailwindcss' package.")) {
+    throw new Error('Expected tailwind installation warning');
+  }
+
+  // Tailwind directives should be unprocessed with missing package
+  await expectFileToMatch('dist/test-project/styles.css', '@tailwind base; @tailwind components;');
+  await expectFileToMatch('dist/test-project/main.js', '@tailwind base; @tailwind components;');
+}
diff --git a/tests/legacy-cli/e2e/tests/build/vendor-chunk-symlink-node-module.ts b/tests/legacy-cli/e2e/tests/build/vendor-chunk-symlink-node-module.ts
deleted file mode 100644
index 61eae952ea71..000000000000
--- a/tests/legacy-cli/e2e/tests/build/vendor-chunk-symlink-node-module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {ng} from '../../utils/process';
-import {deleteFile, expectFileToExist, moveFile, symlinkFile} from '../../utils/fs';
-
-
-// THIS TEST REQUIRES TO MOVE NODE_MODULES AND MOVE IT BACK.
-export default function() {
-  // E2E_DISABLED: temporarily disabled
-  return Promise.resolve();
-
-  return Promise.resolve()
-    .then(() => moveFile('node_modules', '../node_modules'))
-    .then(() => symlinkFile('../node_modules', 'node_modules', 'dir'))
-    .then(() => ng('build'))
-    .then(() => expectFileToExist('dist/test-project/vendor.js'))
-    // Cleanup
-    .then(() => {
-      return deleteFile('node_modules')
-        .then(() => moveFile('../node_modules', 'node_modules'));
-    }, (err: any) => {
-      return deleteFile('node_modules')
-        .then(() => moveFile('../node_modules', 'node_modules'))
-        .then(() => { throw err; });
-    })
-}
diff --git a/tests/legacy-cli/e2e/tests/build/watch.ts b/tests/legacy-cli/e2e/tests/build/watch.ts
deleted file mode 100644
index cb3bf7390bb9..000000000000
--- a/tests/legacy-cli/e2e/tests/build/watch.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {
-  killAllProcesses,
-  exec,
-  waitForAnyProcessOutputToMatch,
-  execAndWaitForOutputToMatch
-} from '../../utils/process';
-import { expectToFail } 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;
-
-  if (process.platform.startsWith('win')) {
-    return Promise.resolve();
-  }
-
-  return execAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx)
-    // Should trigger a rebuild.
-    .then(() => exec('touch', 'src/main.ts'))
-    .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
-    .then(() => killAllProcesses(), (err: any) => {
-      killAllProcesses();
-      throw err;
-    })
-    .then(() => execAndWaitForOutputToMatch('ng', ['serve', '--no-watch'], webpackGoodRegEx))
-    // Should not trigger a rebuild when not watching files.
-    .then(() => exec('touch', 'src/main.ts'))
-    .then(() => expectToFail(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000)))
-    .then(() => killAllProcesses(), (err: any) => {
-      killAllProcesses();
-      throw err;
-    })
-}
diff --git a/tests/legacy-cli/e2e/tests/build/worker.ts b/tests/legacy-cli/e2e/tests/build/worker.ts
index c509abec9590..be1d2eda642e 100644
--- a/tests/legacy-cli/e2e/tests/build/worker.ts
+++ b/tests/legacy-cli/e2e/tests/build/worker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
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 8180abdc6cc7..4f289095de13 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
@@ -1,4 +1,5 @@
 import { expectFileToMatch, rimraf } from '../../../utils/fs';
+import { uninstallPackage } from '../../../utils/packages';
 import { ng } from '../../../utils/process';
 import { isPrereleaseCli } from '../../../utils/project';
 
@@ -20,23 +21,7 @@ export default async function () {
   await ng('add',  `@angular/material${tag}`, '--theme', 'custom', '--verbose');
   await expectFileToMatch('package.json', /@angular\/material/);
 
-  const output1 = await ng('add', '@angular/material');
-  if (!output1.stdout.includes('Skipping installation: Package already installed')) {
-    throw new Error('Installation was not skipped');
-  }
-
-  const output2 = await ng('add', '@angular/material@latest');
-  if (output2.stdout.includes('Skipping installation: Package already installed')) {
-    throw new Error('Installation should not have been skipped');
-  }
-
-  const output3 = await ng('add', '@angular/material@8.0.0');
-  if (output3.stdout.includes('Skipping installation: Package already installed')) {
-    throw new Error('Installation should not have been skipped');
-  }
-
-  const output4 = await ng('add', '@angular/material@8');
-  if (!output4.stdout.includes('Skipping installation: Package already installed')) {
-    throw new Error('Installation was not skipped');
-  }
+  // Clean up existing cdk package
+  // Not doing so can cause adding material to fail if an incompatible cdk is present
+  await uninstallPackage('@angular/cdk');
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-pwa-yarn.ts b/tests/legacy-cli/e2e/tests/commands/add/add-pwa-yarn.ts
deleted file mode 100644
index 4730f1f1ef0f..000000000000
--- a/tests/legacy-cli/e2e/tests/commands/add/add-pwa-yarn.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { join } from 'path';
-import { getGlobalVariable } from '../../../utils/env';
-import { expectFileToExist, readFile, rimraf } from '../../../utils/fs';
-import { ng, npm } from '../../../utils/process';
-
-export default async function () {
-    if (getGlobalVariable('package-manager') === 'yarn') {
-      return;
-    }
-
-    // forcibly remove in case another test doesn't clean itself up
-    await rimraf('node_modules/@angular/pwa');
-
-    // set yarn as package manager
-    await ng('config', 'cli.packageManager', 'yarn');
-    await ng('add', '@angular/pwa');
-    await expectFileToExist(join(process.cwd(), 'src/manifest.webmanifest'));
-
-    // Angular PWA doesn't install as a dependency
-    const { dependencies, devDependencies } = JSON.parse(await readFile(join(process.cwd(), 'package.json')));
-    const hasPWADep = Object.keys({ ...dependencies, ...devDependencies })
-        .some(d => d === '@angular/pwa');
-    if (hasPWADep) {
-        throw new Error(`Expected 'package.json' not to contain a dependency on '@angular/pwa'.`);
-    }
-
-    // 'yarn' will nuke the entire node_modules when it is triggered during the above tests.
-    // Let's restore the previous node_modules state by re-installing using 'npm'
-    // and run 'webdriver-update'. Otherwise, we will start seeing errors in CI like:
-    // Error: Could not find update-config.json. Run 'webdriver-manager update' to download binaries.
-    await npm('install');
-    await npm('run', 'webdriver-update');
-}
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts b/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
index e4737cd71c36..416711c52d69 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
@@ -3,16 +3,16 @@ import { expectFileToExist, readFile, 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/pwa');
-    await ng('add', '@angular/pwa');
-    await expectFileToExist(join(process.cwd(), 'src/manifest.webmanifest'));
+  // forcibly remove in case another test doesn't clean itself up
+  await rimraf('node_modules/@angular/pwa');
+  await ng('add', '@angular/pwa');
+  await expectFileToExist(join(process.cwd(), 'src/manifest.webmanifest'));
 
-    // Angular PWA doesn't install as a dependency
-    const { dependencies, devDependencies } = JSON.parse(await readFile(join(process.cwd(), 'package.json')));
-    const hasPWADep = Object.keys({ ...dependencies, ...devDependencies })
-        .some(d => d === '@angular/pwa');
-    if (hasPWADep) {
-        throw new Error(`Expected 'package.json' not to contain a dependency on '@angular/pwa'.`);
-    }
+  // Angular PWA doesn't install as a dependency
+  const { dependencies, devDependencies } = JSON.parse(await readFile(join(process.cwd(), 'package.json')));
+  const hasPWADep = Object.keys({ ...dependencies, ...devDependencies })
+    .some(d => d === '@angular/pwa');
+  if (hasPWADep) {
+    throw new Error(`Expected 'package.json' not to contain a dependency on '@angular/pwa'.`);
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts b/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
index ea60f2504b19..650cee769bb3 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
@@ -1,18 +1,25 @@
-import { expectFileToExist, rimraf, writeMultipleFiles } from '../../../utils/fs';
+import { getGlobalVariable } from '../../../utils/env';
+import { expectFileToExist, writeMultipleFiles } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
 
 export default async function () {
-  // forcibly remove in case another test doesn't clean itself up
-  await rimraf('node_modules/@angular/material');
+  const testRegistry = getGlobalVariable('package-registry');
 
   // Setup an invalid registry
   await writeMultipleFiles({
     '.npmrc': 'registry=http://127.0.0.1:9999',
   });
+  // The environment variable has priority over the .npmrc
+  const originalRegistryVariable = process.env['NPM_CONFIG_REGISTRY'];
+  process.env['NPM_CONFIG_REGISTRY'] = undefined;
 
-  await expectToFail(() => ng('add', '@angular/pwa'));
+  try {
+    await expectToFail(() => ng('add', '@angular/pwa'));
 
-  await ng('add', '--registry=http://localhost:4873', '@angular/pwa');
-  await expectFileToExist('src/manifest.webmanifest');
+    await ng('add', `--registry=${testRegistry}`, '@angular/pwa');
+    await expectFileToExist('src/manifest.webmanifest');
+  } finally {
+    process.env['NPM_CONFIG_REGISTRY'] = originalRegistryVariable;
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts b/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts
new file mode 100644
index 000000000000..3e4eae89b7f3
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts
@@ -0,0 +1,32 @@
+import { expectFileToMatch, rimraf } from '../../../utils/fs';
+import { uninstallPackage } from '../../../utils/packages';
+import { ng } from '../../../utils/process';
+import { isPrereleaseCli } from '../../../utils/project';
+
+
+export default async function () {
+  // forcibly remove in case another test doesn't clean itself up.
+  await rimraf('node_modules/@angular/localize');
+
+  const tag = await isPrereleaseCli() ?  '@next' : '';
+
+  await ng('add',  `@angular/localize${tag}`);
+  await expectFileToMatch('package.json', /@angular\/localize/);
+
+  const output1 = await ng('add', '@angular/localize');
+  if (!output1.stdout.includes('Skipping installation: Package already installed')) {
+    throw new Error('Installation was not skipped');
+  }
+
+  const output3 = await ng('add', '@angular/localize@10.0.0');
+  if (output3.stdout.includes('Skipping installation: Package already installed')) {
+    throw new Error('Installation should not have been skipped');
+  }
+
+  const output4 = await ng('add', '@angular/localize@10');
+  if (!output4.stdout.includes('Skipping installation: Package already installed')) {
+    throw new Error('Installation was not skipped');
+  }
+
+  await uninstallPackage('@angular/localize');
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts b/tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts
index aabf758930a9..694f90f6020a 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts
@@ -1,5 +1,4 @@
 import { ng } from '../../../utils/process';
-import { expectToFail } from '../../../utils/utils';
 
 export default async function() {
 
diff --git a/tests/legacy-cli/e2e/tests/commands/help/help-json.ts b/tests/legacy-cli/e2e/tests/commands/help/help-json.ts
index af4f18872990..898adfbe5bc6 100644
--- a/tests/legacy-cli/e2e/tests/commands/help/help-json.ts
+++ b/tests/legacy-cli/e2e/tests/commands/help/help-json.ts
@@ -7,7 +7,11 @@ export default async function() {
     const { stdout } = await silentNg(commandName, '--help=json');
 
     if (stdout.trim()) {
-      JSON.parse(stdout);
+      JSON.parse(stdout, (key, value) => {
+        if (key === 'name' && /[A-Z]/.test(value)) {
+          throw new Error(`Option named '${value}' is not kebab case.`);
+        }
+      });
     } else {
       console.warn(`No JSON output for command [${commandName}].`);
     }
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts b/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts
index 660e1e119c8c..aa711551e9df 100644
--- a/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts
+++ b/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts
@@ -1,24 +1,34 @@
-import {join} from 'path';
-import {ng} from '../../../utils/process';
-import {createDir, expectFileToExist} from '../../../utils/fs';
+import { join } from 'path';
+import { ng } from '../../../utils/process';
+import { createDir, expectFileToExist, rimraf } from '../../../utils/fs';
 
+export default async function () {
+  const currentDirectory = process.cwd();
+  const childDirectory = join('src', 'app', 'sub-dir');
 
-export default function() {
-  const subDir = 'sub-dir';
-  const componentDir = join('src', 'app', subDir, 'test-component');
+  try {
+    // Create and enter a child directory inside the project
+    await createDir(childDirectory);
+    process.chdir(childDirectory);
 
-  return Promise.resolve()
-    .then(() => process.chdir('src'))
-    .then(() => process.chdir('app'))
-    .then(() => createDir(subDir))
-    .then(() => process.chdir(subDir))
-    .then(() => ng('generate', 'component', 'test-component'))
-    .then(() => process.chdir('../../..'))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.ts')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.spec.ts')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.html')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.css')))
+    // Generate a component inside the child directory
+    await ng('generate', 'component', 'test-component');
 
-    // Try to run the unit tests.
-    .then(() => ng('test', '--watch=false'));
+    // Move back to the root of the workspacee
+    process.chdir(currentDirectory);
+
+    // Ensure component is created in the correct location relative to the workspace root
+    const componentDirectory = join(childDirectory, 'test-component');
+    await expectFileToExist(join(componentDirectory, 'test-component.component.ts'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.spec.ts'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.html'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.css'));
+
+    // Ensure unit test execute and pass
+    await ng('test', '--watch=false');
+  } finally {
+    // Windows CI may fail to clean up the created directory
+    // Resolves: "Error: Running "cmd.exe /c git clean -df" returned error code 1"
+    await rimraf(childDirectory);
+  }
 }
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 94d73a23fcb3..7c8e4074bb07 100644
--- a/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
+++ b/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
@@ -1,6 +1,7 @@
+import { oneLine } from 'common-tags';
+import { appendToFile } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
-import { oneLine } from 'common-tags';
 
 export default function () {
   return ng('generate', 'component', 'test-component')
@@ -12,5 +13,6 @@ export default function () {
           in ${output.stdout}.`);
       }
     })
+    .then(() => appendToFile('src/app/test-component/test-component.component.ts', '\n// new content'))
     .then(() => expectToFail(() => ng('generate', 'component', 'test-component')));
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-module-export.ts b/tests/legacy-cli/e2e/tests/generate/component/component-module-export.ts
index c17e7f051468..4c2b2e89d8c5 100644
--- a/tests/legacy-cli/e2e/tests/generate/component/component-module-export.ts
+++ b/tests/legacy-cli/e2e/tests/generate/component/component-module-export.ts
@@ -7,7 +7,7 @@ export default function() {
   const modulePath = join('src', 'app', 'app.module.ts');
 
   return ng('generate', 'component', 'test-component', '--export')
-    .then(() => expectFileToMatch(modulePath, 'exports: [TestComponentComponent]'))
+    .then(() => expectFileToMatch(modulePath, /exports: \[\r?\n(\s*)  TestComponentComponent\r?\n\1\]/))
 
     // Try to run the unit tests.
     .then(() => ng('test', '--watch=false'));
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts b/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts
index 2a53a3446847..f76c09abe1fc 100644
--- a/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts
+++ b/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts
@@ -1,27 +1,38 @@
-import {join} from 'path';
-import {ng} from '../../../utils/process';
-import {expectFileToExist} from '../../../utils/fs';
+import { join } from 'path';
+import { ng } from '../../../utils/process';
+import { expectFileToExist, rimraf } from '../../../utils/fs';
 
-
-export default function() {
+export default async function () {
   const upperDirs = join('non', 'existing', 'dir');
   const rootDir = join('src', 'app', upperDirs);
 
-  const componentDir = join(rootDir, 'test-component');
-  const componentTwoDir = join(rootDir, 'test-component-two');
+  const componentDirectory = join(rootDir, 'test-component');
+  const componentTwoDirectory = join(rootDir, 'test-component-two');
+
+  try {
+    // Generate a component
+    await ng('generate', 'component', `${upperDirs}/test-component`)
+
+    // Ensure component is created in the correct location relative to the workspace root
+    await expectFileToExist(join(componentDirectory, 'test-component.component.ts'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.spec.ts'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.html'));
+    await expectFileToExist(join(componentDirectory, 'test-component.component.css'));
+
+    // Generate another component
+    await ng('generate', 'component', `${upperDirs}/Test-Component-Two`);
 
-  return ng('generate', 'component', `${upperDirs}/test-component`)
-    .then(() => expectFileToExist(componentDir))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.ts')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.spec.ts')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.html')))
-    .then(() => expectFileToExist(join(componentDir, 'test-component.component.css')))
-    .then(() => ng('generate', 'component', `${upperDirs}/Test-Component-Two`))
-    .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.ts')))
-    .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.spec.ts')))
-    .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.html')))
-    .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.css')))
+    // Ensure component is created in the correct location relative to the workspace root
+    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.component.ts'));
+    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.component.spec.ts'));
+    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.component.html'));
+    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.component.css'));
 
-    // Try to run the unit tests.
-    .then(() => ng('test', '--watch=false'));
+    // Ensure unit test execute and pass
+    await ng('test', '--watch=false');
+  } finally {
+    // Windows CI may fail to clean up the created directory
+    // Resolves: "Error: Running "cmd.exe /c git clean -df" returned error code 1"
+    await rimraf(rootDir);
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/directive/directive-module-export.ts b/tests/legacy-cli/e2e/tests/generate/directive/directive-module-export.ts
index 2e1499f2d0e2..376b5cb762f5 100644
--- a/tests/legacy-cli/e2e/tests/generate/directive/directive-module-export.ts
+++ b/tests/legacy-cli/e2e/tests/generate/directive/directive-module-export.ts
@@ -7,7 +7,7 @@ export default function() {
   const modulePath = join('src', 'app', 'app.module.ts');
 
   return ng('generate', 'directive', 'test-directive', '--export')
-    .then(() => expectFileToMatch(modulePath, 'exports: [TestDirectiveDirective]'))
+    .then(() => expectFileToMatch(modulePath, /exports: \[\r?\n(\s*)  TestDirectiveDirective\r?\n\1\]/))
 
     // Try to run the unit tests.
     .then(() => ng('test', '--watch=false'));
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-linker.ts b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-linker.ts
new file mode 100644
index 000000000000..b56d9d1e69a1
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-linker.ts
@@ -0,0 +1,103 @@
+import { writeFile } from '../../../utils/fs';
+import { getActivePackageManager } from '../../../utils/packages';
+import { ng, silentYarn } from '../../../utils/process';
+import { updateJsonFile } from '../../../utils/project';
+import { getGlobalVariable } from '../../../utils/env';
+
+export default async function () {
+  if ((getGlobalVariable('argv')['ve'])) {
+    // Does not apply to ViewEngine
+    return;
+  }
+
+  await ng('generate', 'library', 'my-lib');
+
+  // Enable partial compilation mode (linker) for the library
+  // Enable ivy for production as well (current schematic disables ivy in production)
+  await updateJsonFile('projects/my-lib/tsconfig.lib.prod.json', config => {
+    const { angularCompilerOptions = {} } = config;
+    angularCompilerOptions.enableIvy = true;
+    angularCompilerOptions.compilationMode = 'partial';
+    config.angularCompilerOptions = angularCompilerOptions;
+  });
+
+  await writeFile('./src/app/app.module.ts', `
+      import { BrowserModule } from '@angular/platform-browser';
+      import { NgModule } from '@angular/core';
+      import { MyLibModule } from 'my-lib';
+
+      import { AppComponent } from './app.component';
+
+      @NgModule({
+        declarations: [
+          AppComponent
+        ],
+        imports: [
+          BrowserModule,
+          MyLibModule,
+        ],
+        providers: [],
+        bootstrap: [AppComponent]
+      })
+      export class AppModule { }
+    `);
+
+  await writeFile('./src/app/app.component.ts', `
+      import { Component } from '@angular/core';
+      import { MyLibService } from 'my-lib';
+
+      @Component({
+        selector: 'app-root',
+        template: '<lib-my-lib></lib-my-lib>'
+      })
+      export class AppComponent {
+        title = 'app';
+
+        constructor(myLibService: MyLibService) {
+          console.log(myLibService);
+        }
+      }
+    `);
+
+  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', async () => {
+        await page.navigateTo();
+        expect(await 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,
+        }));
+      });
+    });
+  `);
+
+  await runLibraryTests();
+  await runLibraryTests(true);
+}
+
+async function runLibraryTests(prodMode = false): Promise<void> {
+  const args = ['build', 'my-lib'];
+  if (prodMode) {
+    args.push('--prod');
+  }
+
+  await ng(...args);
+
+  // Check that the tests succeeds both with named project, unnamed (should test app), and prod.
+  await ng('e2e');
+  await ng('e2e', 'test-project', '--devServerTarget=test-project:serve:production');
+}
diff --git a/tests/legacy-cli/e2e/tests/generate/module/module-route.ts b/tests/legacy-cli/e2e/tests/generate/module/module-route.ts
new file mode 100644
index 000000000000..5dafaa581660
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/generate/module/module-route.ts
@@ -0,0 +1,12 @@
+import { expectFileToExist } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+export default async function () {
+  await ng('config', 'schematics.@schematics/angular.component.style', 'scss');
+
+  await ng('generate', 'module', 'test', '--routing');
+
+  await ng('generate', 'module', 'home', '-m', 'test', '--route', 'home', '--routing');
+
+  await expectFileToExist('src/app/home/home.component.scss');
+}
diff --git a/tests/legacy-cli/e2e/tests/generate/pipe/pipe-module-export.ts b/tests/legacy-cli/e2e/tests/generate/pipe/pipe-module-export.ts
index 570f7b339bcb..4773b2b5e231 100644
--- a/tests/legacy-cli/e2e/tests/generate/pipe/pipe-module-export.ts
+++ b/tests/legacy-cli/e2e/tests/generate/pipe/pipe-module-export.ts
@@ -7,7 +7,7 @@ export default function() {
   const modulePath = join('src', 'app', 'app.module.ts');
 
   return ng('generate', 'pipe', 'test-pipe', '--export')
-    .then(() => expectFileToMatch(modulePath, 'exports: [TestPipePipe]'))
+    .then(() => expectFileToMatch(modulePath, /exports: \[\r?\n(\s*)  TestPipePipe\r?\n\1\]/))
 
     // Try to run the unit tests.
     .then(() => ng('test', '--watch=false'));
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-default.ts b/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
index 8761196485c7..c37427d4ddfa 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
@@ -15,7 +15,7 @@ export default async function() {
     join('src/app/i18n-test', 'i18n-test.component.html'),
     '<p i18n>Hello world</p>',
   );
-  await ng('xi18n');
+  await ng('extract-i18n');
   await expectFileToExist('messages.xlf');
   await expectFileToMatch('messages.xlf', /Hello world/);
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-errors.ts b/tests/legacy-cli/e2e/tests/i18n/extract-errors.ts
index 51152622c1f3..479fe4b94432 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-errors.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-errors.ts
@@ -16,7 +16,7 @@ export default async function () {
     '<p i18n>Hello world <span i18n>inner</span></p>',
   );
 
-  const { message } = await expectToFail(() => ng('xi18n'));
+  const { message } = await expectToFail(() => ng('extract-i18n'));
 
   const veProject = getGlobalVariable('argv')['ve'];
   const msg = veProject
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts
index 71418bfbe293..98a622c5a515 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts
@@ -61,7 +61,7 @@ export default async function() {
   await installPackage(localizeVersion);
 
   // Extract messages
-  await ng('xi18n', '--ivy');
+  await ng('extract-i18n', '--ivy');
   await expectFileToMatch('messages.xlf', 'Hello world');
   await expectFileToMatch('messages.xlf', 'i18n-lib-test works!');
   await expectFileToMatch('messages.xlf', 'src/app/app.component.html');
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts
index e9e61ef7db58..a3cd8c93dbe8 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts
@@ -21,7 +21,7 @@ export default async function() {
   );
 
   // Should fail with --ivy flag if `@angular/localize` is missing
-  const { message: message1 } = await expectToFail(() => ng('xi18n'));
+  const { message: message1 } = await expectToFail(() => ng('extract-i18n'));
   if (!message1.includes(`Ivy extraction requires the '@angular/localize' package.`)) {
     throw new Error('Expected localize package error message when missing');
   }
@@ -34,13 +34,13 @@ export default async function() {
   await installPackage(localizeVersion);
 
   // Should show ivy enabled application warning without --ivy flag
-  const { stderr: message3 } = await ng('xi18n', '--no-ivy');
+  const { stderr: message3 } = await ng('extract-i18n', '--no-ivy');
   if (!message3.includes(`Ivy extraction not enabled but application is Ivy enabled.`)) {
     throw new Error('Expected ivy enabled application warning');
   }
 
   // Should not show any warnings when extracting
-  const { stderr: message5 } = await ng('xi18n', '--ivy');
+  const { stderr: message5 } = await ng('extract-i18n', '--ivy');
   if (message5.includes('WARNING')) {
     throw new Error('Expected no warnings to be shown');
   }
@@ -53,7 +53,7 @@ export default async function() {
   });
 
   // Should show ivy disabled application warning with --ivy flag and enableIvy false
-  const { message: message4 } = await expectToFail(() => ng('xi18n', '--ivy'));
+  const { message: message4 } = await expectToFail(() => ng('extract-i18n', '--ivy'));
   if (!message4.includes(`Ivy extraction enabled but application is not Ivy enabled.`)) {
     throw new Error('Expected ivy disabled application warning');
   }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts b/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
index a08ae923cda3..dc6a4df3787a 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
@@ -14,7 +14,7 @@ export default function() {
     .then(() => writeFile(
       join('src/app/i18n-test', 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n', '--i18n-locale', 'fr'))
+    .then(() => ng('extract-i18n', '--i18n-locale', 'fr'))
     .then((output) => {
       if (!output.stderr.match(/starting from Angular v4/)) {
         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 eeca7032faca..c4454bbcbe31 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts
@@ -14,6 +14,6 @@ export default async function () {
     join('src/app/i18n-test', 'i18n-test.component.html'),
     '<p i18n>Hello world</p>',
   );
-  await ng('xi18n', '--out-file', 'messages.fr.xlf');
+  await ng('extract-i18n', '--out-file', 'messages.fr.xlf');
   await 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 4529cf8ef42b..3677c7f01662 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts
@@ -17,7 +17,7 @@ export default function() {
     .then(() =>
       writeFile(join('src/app/i18n-test', 'i18n-test.component.html'), '<p i18n>Hello world</p>'),
     )
-    .then(() => ng('xi18n', '--format', 'xmb'))
+    .then(() => ng('extract-i18n', '--format', 'xmb'))
     .then(() => expectFileToExist('messages.xmb'))
     .then(() => expectFileToMatch('messages.xmb', /Hello world/));
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts
index ddb6fbce801f..c60aa1446d85 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts
@@ -104,7 +104,7 @@ export default async function () {
   );
 
   // Extract the translation messages and copy them for each language.
-  await ng('xi18n', '--output-path=src/locale');
+  await ng('extract-i18n', '--output-path=src/locale');
   await expectFileToExist('src/locale/messages.xlf');
   await expectFileToMatch('src/locale/messages.xlf', `source-language="en-US"`);
   await expectFileToMatch('src/locale/messages.xlf', `An introduction header for this sample`);
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts
index 6ec11b72e9a4..b82a896a0377 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts
new file mode 100644
index 000000000000..d53aa837e815
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts
@@ -0,0 +1,10 @@
+import { executeTest } from './ivy-localize-dl-xliff2';
+import { setupI18nConfig } from './legacy';
+
+export default async function() {
+  // Setup i18n tests and config.
+  await setupI18nConfig(true, 'arb');
+
+  // Execute the tests
+  await executeTest();
+}
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-json.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-json.ts
new file mode 100644
index 000000000000..46f45c4d6275
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-json.ts
@@ -0,0 +1,10 @@
+import { executeTest } from './ivy-localize-dl-xliff2';
+import { setupI18nConfig } from './legacy';
+
+export default async function() {
+  // Setup i18n tests and config.
+  await setupI18nConfig(true, 'json');
+
+  // Execute the tests
+  await executeTest();
+}
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts
index 14f58c413db8..92216e352666 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts
new file mode 100644
index 000000000000..debc670b12da
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts
@@ -0,0 +1,52 @@
+import { expectFileToMatch, prependToFile, readFile, replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+import { externalServer, langTranslations, setupI18nConfig } from './legacy';
+
+export default async function() {
+  // Setup i18n tests and config.
+  await setupI18nConfig();
+
+  // Update angular.json to only localize one locale
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appProject = workspaceJson.projects['test-project'];
+    appProject.architect['build'].options.localize = ['fr'];
+  });
+
+  // Update E2E test to look for augmented locale data
+  await replaceInFile('./e2e/src/app.fr.e2e-spec.ts', 'janvier', 'changed-janvier');
+
+  // Augment the locale data and import into the main application file
+  const localeData = await readFile('node_modules/@angular/common/locales/global/fr.js');
+  await writeFile('src/fr-changed.js', localeData.replace('janvier', 'changed-janvier'));
+  await prependToFile('src/main.ts', 'import \'./fr-changed.js\';\n');
+
+  // Run a build and test
+  await ng('build');
+  for (const { lang, outputPath } of langTranslations) {
+    // Only the fr locale was built for this test
+    if (lang !== 'fr') {
+      continue;
+    }
+
+    // Ensure locale is inlined (@angular/localize plugin inlines `$localize.locale` references)
+    // The only reference in a new application is in @angular/core
+    await expectFileToMatch(`${outputPath}/vendor.js`, lang);
+
+    // Execute Application E2E tests with dev server
+    await ng('e2e', `--configuration=${lang}`, '--port=0');
+
+    // Execute Application E2E tests for a production build without dev server
+    const server = externalServer(outputPath, `/${lang}/`);
+    try {
+      await ng(
+        'e2e',
+        `--configuration=${lang}`,
+        '--devServerTarget=',
+        `--baseUrl=http://localhost:4200/${lang}/`,
+      );
+    } finally {
+      server.close();
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts
index 4d0628f571b5..ef8c45d8d612 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts
index 1c144214dd8c..e59a78344950 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts
index 1b7b26a92f4a..2402d2ed90cc 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts
@@ -119,7 +119,7 @@ export default async function() {
   );
 
   // Extract the translation messages and copy them for each language.
-  await ng('xi18n', '--output-path=src/locale');
+  await ng('extract-i18n', '--output-path=src/locale');
   await expectFileToExist('src/locale/messages.xlf');
   await expectFileToMatch('src/locale/messages.xlf', `source-language="en-US"`);
   await expectFileToMatch('src/locale/messages.xlf', `An introduction header for this sample`);
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts
index 0fd335e2cea7..d601638df964 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tests/legacy-cli/e2e/tests/i18n/legacy.ts b/tests/legacy-cli/e2e/tests/i18n/legacy.ts
index a53df4aa75cf..ef1e132cee7d 100644
--- a/tests/legacy-cli/e2e/tests/i18n/legacy.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/legacy.ts
@@ -89,6 +89,18 @@ export const formats = {
       [/<source>.*?<\/source>/g, ''],
     ],
   },
+  'json': {
+    ext: 'json',
+    sourceCheck: '"locale": "en-US"',
+    replacements: [
+    ],
+  },
+  'arb': {
+    ext: 'arb',
+    sourceCheck: '"@@locale": "en-US"',
+    replacements: [
+    ],
+  }
 };
 
 export async function setupI18nConfig(useLocalize = true, format: keyof typeof formats = 'xlf') {
@@ -219,14 +231,17 @@ export async function setupI18nConfig(useLocalize = true, format: keyof typeof f
 
   // Extract the translation messages.
   await ng(
-    'xi18n',
+    'extract-i18n',
     '--output-path=src/locale',
     `--format=${format}`,
   );
   const translationFile = `src/locale/messages.${formats[format].ext}`;
   await expectFileToExist(translationFile);
   await expectFileToMatch(translationFile, formats[format].sourceCheck);
-  await expectFileToMatch(translationFile, `An introduction header for this sample`);
+
+  if (format !== 'json') {
+    await expectFileToMatch(translationFile, `An introduction header for this sample`);
+  }
 
   // Make translations for each language.
   for (const { lang, translationReplacements } of langTranslations) {
@@ -235,14 +250,14 @@ export async function setupI18nConfig(useLocalize = true, format: keyof typeof f
       for (const replacements of translationReplacements) {
         await replaceInFile(
           `src/locale/messages.${lang}.${formats[format].ext}`,
-          replacements[0],
+          new RegExp(replacements[0], 'g'),
           replacements[1] as string,
         );
       }
       for (const replacement of formats[format].replacements) {
         await replaceInFile(
           `src/locale/messages.${lang}.${formats[format].ext}`,
-          replacement[0],
+          new RegExp(replacement[0], 'g'),
           replacement[1] as string,
         );
       }
diff --git a/tests/legacy-cli/e2e/tests/misc/ask-analytics-install.ts b/tests/legacy-cli/e2e/tests/misc/ask-analytics-install.ts
index 23b9955dd5d0..2731caf46a0f 100644
--- a/tests/legacy-cli/e2e/tests/misc/ask-analytics-install.ts
+++ b/tests/legacy-cli/e2e/tests/misc/ask-analytics-install.ts
@@ -15,7 +15,7 @@ export default async function() {
     // Install the CLI with TTY force enabled
     const execution = execWithEnv(
       'npm',
-      ['install', '@angular/cli', '--registry=http://localhost:4873'],
+      ['install', '@angular/cli'],
       { ...process.env, 'NG_FORCE_TTY': '1' },
     );
 
diff --git a/tests/legacy-cli/e2e/tests/misc/assets.ts b/tests/legacy-cli/e2e/tests/misc/assets.ts
deleted file mode 100644
index 181a07dac4a3..000000000000
--- a/tests/legacy-cli/e2e/tests/misc/assets.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {writeFile, expectFileToExist, expectFileToMatch} 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.
-
-  return writeFile('src/assets/.file', '')
-    .then(() => writeFile('src/assets/test.abc', 'hello world'))
-    .then(() => ng('build'))
-    .then(() => expectFileToExist('dist/test-project/favicon.ico'))
-    .then(() => expectFileToExist('dist/test-project/assets/.file'))
-    .then(() => expectFileToMatch('dist/test-project/assets/test.abc', 'hello world'))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/assets/.gitkeep')));
-}
diff --git a/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts b/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts
new file mode 100644
index 000000000000..29cc95795a92
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts
@@ -0,0 +1,38 @@
+import { expectFileToMatch } from '../../utils/fs';
+import { ng, silentNpm } from '../../utils/process';
+import { installPackage, uninstallPackage } from '../../utils/packages';
+import { isPrereleaseCli } from '../../utils/project';
+
+export default async function () {
+  // Must publish old version to local registry to allow install. This is especially important
+  // for release commits as npm will try to request tooling packages that are not on the npm registry yet
+  const { stdout: stdoutPack1 } = await silentNpm(
+    'pack',
+    '@schematics/angular@7',
+    '--registry=https://registry.npmjs.org',
+  );
+  await silentNpm('publish', stdoutPack1.trim(), '--tag=outdated');
+  const { stdout: stdoutPack2 } = await silentNpm(
+    'pack',
+    '@angular-devkit/core@7',
+    '--registry=https://registry.npmjs.org',
+  );
+  await silentNpm('publish', stdoutPack2.trim(), '--tag=outdated');
+  const { stdout: stdoutPack3 } = await silentNpm(
+    'pack',
+    '@angular-devkit/schematics@7',
+    '--registry=https://registry.npmjs.org',
+  );
+  await silentNpm('publish', stdoutPack3.trim(), '--tag=outdated');
+
+  // Install outdated and incompatible version
+  await installPackage('@schematics/angular@7');
+
+  const tag = (await isPrereleaseCli()) ? '@next' : '';
+  await ng('add', `@angular/material${tag}`);
+  await expectFileToMatch('package.json', /@angular\/material/);
+
+  // Clean up existing cdk package
+  // Not doing so can cause adding material to fail if an incompatible cdk is present
+  await uninstallPackage('@angular/cdk');
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/live-reload.ts b/tests/legacy-cli/e2e/tests/misc/live-reload.ts
deleted file mode 100644
index c70ae92ab091..000000000000
--- a/tests/legacy-cli/e2e/tests/misc/live-reload.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-export default function temporarilyDisabledTest() { return Promise.resolve(); }
-// import * as os from 'os';
-// import * as _ from 'lodash';
-// import * as express from 'express';
-// import * as http from 'http';
-
-// import {appendToFile, writeMultipleFiles, writeFile} from '../../utils/fs';
-// import {
-//   killAllProcesses,
-//   execAndWaitForOutputToMatch,
-//   waitForAnyProcessOutputToMatch
-// } from '../../utils/process';
-// import { wait } from '../../utils/utils';
-
-
-// export default function () {
-//   const protractorGoodRegEx = /Jasmine started/;
-//   const webpackGoodRegEx = /: Compiled successfully./;
-
-//   // Create an express api for the Angular app to call.
-//   const app = express();
-//   const server = http.createServer(app);
-//   let liveReloadCount = 0;
-//   function resetApiVars() {
-//     liveReloadCount = 0;
-//   }
-
-//   server.listen(0);
-//   app.set('port', server.address().port);
-
-//   const firstLocalIp = _(os.networkInterfaces())
-//     .values()
-//     .flatten()
-//     .filter({ family: 'IPv4', internal: false })
-//     .map('address')
-//     .first();
-//   const publicHost = `${firstLocalIp}:4200`;
-
-//   const apiUrl = `http://localhost:${server.address().port}`;
-
-//   // This endpoint will be pinged by the main app on each reload.
-//   app.get('/live-reload-count', _ => liveReloadCount++);
-
-//   const proxyConfigFile = 'proxy.config.json';
-//   const proxyConfig = {
-//     '/live-reload-count': {
-//       target: apiUrl
-//     }
-//   };
-
-//   return Promise.resolve()
-//     .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 { }
-//       `,
-//       // e2e test that just opens the page and waits, so that the app runs.
-//       './e2e/app.e2e-spec.ts': `
-//         import { browser } from 'protractor';
-
-//         describe('master-project App', function() {
-//           it('should wait', _ => {
-//             browser.get('/');
-//             browser.sleep(30000);
-//           });
-//         });
-//       `,
-//       // App that calls the express server once.
-//       './src/app/app.component.ts': `
-//         import { Component } from '@angular/core';
-//         import { Http } from '@angular/http';
-
-//         @Component({
-//           selector: 'app-root',
-//           template: '<h1>Live reload test</h1>'
-//         })
-//         export class AppComponent {
-//           constructor(private http: Http) {
-//             http.get('${apiUrl + '/live-reload-count'}').subscribe(res => null);
-//           }
-//         }
-//       `
-//     }))
-//     .then(_ => execAndWaitForOutputToMatch(
-//       'ng',
-//       ['e2e', '--watch', '--live-reload'],
-//       protractorGoodRegEx
-//     ))
-//     // Let app run.
-//     .then(_ => wait(2000))
-//     .then(_ => appendToFile('src/main.ts', 'console.log(1);'))
-//     .then(_ => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
-//     .then(_ => wait(2000))
-//     .then(_ => {
-//       if (liveReloadCount != 2) {
-//         throw new Error(
-//           `Expected API to have been called 2 times but it was called ${liveReloadCount} times.`
-//         );
-//       }
-//     })
-//     .then(_ => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-//     .then(_ => resetApiVars())
-//     // Serve with live reload off should call api only once.
-//     .then(_ => execAndWaitForOutputToMatch(
-//       'ng',
-//       ['e2e', '--watch', '--no-live-reload'],
-//       protractorGoodRegEx
-//     ))
-//     .then(_ => wait(2000))
-//     .then(_ => appendToFile('src/main.ts', 'console.log(1);'))
-//     .then(_ => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
-//     .then(_ => wait(2000))
-//     .then(_ => {
-//       if (liveReloadCount != 1) {
-//         throw new Error(
-//           `Expected API to have been called 1 time but it was called ${liveReloadCount} times.`
-//         );
-//       }
-//     })
-//     .then(_ => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-//     .then(_ => resetApiVars())
-//     // Serve with live reload client set to api should call api.
-//     .then(() => writeFile(proxyConfigFile, JSON.stringify(proxyConfig, null, 2)))
-//     // Update the component to call the webserver
-//     .then(() => writeFile('./src/app/app.component.ts',
-//       `
-//         import { Component } from '@angular/core';
-//         import { Http } from '@angular/http';
-//         @Component({
-//           selector: 'app-root',
-//           template: '<h1>Live reload test</h1>'
-//         })
-//         export class AppComponent {
-//           constructor(private http: Http) {
-//             http.get('http://${publicHost + '/live-reload-count'}').subscribe(res => null);
-//           }
-//         }`))
-//     .then(_ => execAndWaitForOutputToMatch(
-//       'ng',
-//       ['e2e', '--watch', '--host=0.0.0.0', '--port=4200', `--public-host=${publicHost}`, '--proxy', proxyConfigFile],
-//       protractorGoodRegEx
-//     ))
-//     .then(_ => wait(2000))
-//     .then(_ => appendToFile('src/main.ts', 'console.log(1);'))
-//     .then(_ => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
-//     .then(_ => wait(2000))
-//     .then(_ => {
-//       if (liveReloadCount != 2) {
-//         throw new Error(
-//           `Expected API to have been called 2 times but it was called ${liveReloadCount} times.`
-//         );
-//       }
-//     })
-//     .then(_ => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-//     .then(_ => server.close(), (err) => { server.close(); throw err; });
-// }
diff --git a/tests/legacy-cli/e2e/tests/misc/npm-7.ts b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
new file mode 100644
index 000000000000..e08e204d89fc
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
@@ -0,0 +1,100 @@
+import { rimraf } from '../../utils/fs';
+import { getActivePackageManager } from '../../utils/packages';
+import { ng, npm } from '../../utils/process';
+import { isPrereleaseCli } from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
+
+const warningText = 'npm version 7.5.6 or higher is recommended';
+
+export default async function () {
+  // Only relevant with npm as a package manager
+  if (getActivePackageManager() !== 'npm') {
+    return;
+  }
+
+  // Windows CI fails with permission errors when trying to replace npm
+  if (process.platform.startsWith('win')) {
+    return;
+  }
+
+  // NPM 7 doesn't support Node v10.
+  if (process.version.startsWith('v10')) {
+    return;
+  }
+
+  const currentDirectory = process.cwd();
+
+  const extraArgs = [];
+  if (isPrereleaseCli()) {
+    extraArgs.push('--next');
+  }
+
+  try {
+    // Install version >=7.5.6
+    await npm('install', '--global', 'npm@>=7.5.6');
+
+    // Ensure `ng update` does not show npm warning
+    const { stderr: stderrUpdate1 } = await ng('update', ...extraArgs);
+    if (stderrUpdate1.includes(warningText)) {
+      throw new Error('ng update expected to not show npm version warning.');
+    }
+
+    // Install version <7.5.6
+    await npm('install', '--global', 'npm@7.4.0');
+
+    // Ensure `ng add` shows npm warning
+    const { message: stderrAdd } = await expectToFail(() => ng('add'));
+    if (!stderrAdd.includes(warningText)) {
+      throw new Error('ng add expected to show npm version warning.');
+    }
+
+    // Ensure `ng update` shows npm warning
+    const { stderr: stderrUpdate2 } = await ng('update', ...extraArgs);
+    if (!stderrUpdate2.includes(warningText)) {
+      throw new Error('ng update expected to show npm version warning.');
+    }
+
+    // Ensure `ng build` executes successfully
+    const { stderr: stderrBuild } = await ng('build');
+    if (stderrBuild.includes(warningText)) {
+      throw new Error('ng build expected to not show npm version warning.');
+    }
+
+    // Ensure `ng new` shows npm warning
+    // Must be outside the project for `ng new`
+    process.chdir('..');
+    const { message: stderrNew } = await expectToFail(() => ng('new'));
+    if (!stderrNew.includes(warningText)) {
+      throw new Error('ng new expected to show npm version warning.');
+    }
+
+    // Ensure `ng new --package-manager=npm` shows npm warning
+    const { message: stderrNewNpm } = await expectToFail(() => ng('new', '--package-manager=npm'));
+    if (!stderrNewNpm.includes(warningText)) {
+      throw new Error('ng new expected to show npm version warning.');
+    }
+
+    // Ensure `ng new --skip-install` executes successfully
+    const { stderr: stderrNewSkipInstall } = await ng('new', 'npm-seven-skip', '--skip-install');
+    if (stderrNewSkipInstall.includes(warningText)) {
+      throw new Error('ng new --skip-install expected to not show npm version warning.');
+    }
+
+    // Ensure `ng new --package-manager=yarn` executes successfully
+    // Need an additional npmrc file since yarn does not use the NPM registry environment variable
+    const { stderr: stderrNewYarn } = await ng('new', 'npm-seven-yarn', '--package-manager=yarn');
+    if (stderrNewYarn.includes(warningText)) {
+      throw new Error('ng new --package-manager=yarn expected to not show npm version warning.');
+    }
+  } finally {
+    // Cleanup extra test projects
+    await rimraf('npm-seven-skip');
+    await rimraf('npm-seven-yarn');
+
+    // Change directory back
+    process.chdir(currentDirectory);
+
+    // Reset version back to 6.x
+    await npm('install', '--global', 'npm@6');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/webpack-5.ts b/tests/legacy-cli/e2e/tests/misc/webpack-5.ts
index f68b540f4a97..1c6c1e9c45bc 100644
--- a/tests/legacy-cli/e2e/tests/misc/webpack-5.ts
+++ b/tests/legacy-cli/e2e/tests/misc/webpack-5.ts
@@ -1,15 +1,21 @@
+import { getGlobalVariable } from '../../utils/env';
 import { rimraf } from '../../utils/fs';
 import { killAllProcesses, ng, silentYarn } from '../../utils/process';
 import { ngServe, updateJsonFile } from '../../utils/project';
 
 export default async function() {
+  // Webpack 5 has a transitive dependency on `@npmcli/fs@1.1.0`, which doesn't support Node v10.
+  if (process.version.startsWith('v10')) {
+    return;
+  }
+
   // Setup project for yarn usage
   await rimraf('node_modules');
   await updateJsonFile('package.json', (json) => {
-    json.resolutions = { webpack: '5.1.0' };
+    json.resolutions = { webpack: '5.1.3' };
   });
-  await silentYarn();
-  await silentYarn('webdriver-update');
+  const testRegistry = getGlobalVariable('package-registry');
+  await silentYarn(`--registry=${testRegistry}`);
 
   // Ensure webpack 5 is used
   const { stdout } = await silentYarn('list', '--pattern', 'webpack');
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts b/tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts
deleted file mode 100644
index 992cbe4de699..000000000000
--- a/tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { normalize } from 'path';
-import { createProjectFromAsset } from '../../../utils/assets';
-import { exec } from '../../../utils/process';
-import { expectFileToMatch } from '../../../utils/fs';
-
-
-export default function (skipCleaning: () => void) {
-  // This test was broken as it was a copy of the ng2 server test
-  // and did not actually test ng5
-  return;
-
-  return Promise.resolve()
-    .then(() => createProjectFromAsset('webpack/test-server-app'))
-    .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileToMatch('dist/app.main.js',
-      new RegExp('MyInjectable.ctorParameters = .*'
-      + 'type: undefined, decorators.*Inject.*args: .*DOCUMENT.*')))
-    .then(() => expectFileToMatch('dist/app.main.js',
-      new RegExp('AppComponent.ctorParameters = .*MyInjectable')))
-    .then(() => expectFileToMatch('dist/app.main.js',
-      /AppModule \*\/\].*\.testProp = \'testing\'/))
-    .then(() => expectFileToMatch('dist/app.main.js',
-      /platformServer \*\/\]\)\(\)\.bootstrapModuleFactory\(.*\/\* AppModuleNgFactory \*\/\]/))
-    .then(() => expectFileToMatch('dist/app.main.js',
-      /renderModuleFactory \*\/\].*\/\* AppModuleNgFactory \*\/\]/))
-    .then(() => skipCleaning());
-}
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 33d0e6eafe25..cc3965ad7d19 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
@@ -24,7 +24,7 @@ export default async function (skipCleaning: () => void) {
   // Note: these sizes are without Build Optimizer or any advanced optimizations in the CLI.
   await expectFileSizeToBeUnder('dist/app.main.js', (isVe ? 483 : 565) * 1024);
   await expectFileSizeToBeUnder('dist/0.app.main.js', 1 * 1024);
-  await expectFileSizeToBeUnder('dist/1.app.main.js', 2 * 1024);
+  await expectFileSizeToBeUnder('dist/2.app.main.js', 2 * 1024);
 
   // test resource urls without ./
   await replaceInFile('app/app.component.ts', './app.component.html', 'app.component.html');
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts b/tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts
deleted file mode 100644
index 99b012c98d0a..000000000000
--- a/tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {normalize} from 'path';
-
-import {createProjectFromAsset} from '../../../utils/assets';
-import {exec} from '../../../utils/process';
-import {updateJsonFile} from '../../../utils/project';
-import {expectFileSizeToBeUnder, expectFileToExist, expectFileToMatch} from '../../../utils/fs';
-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'))
-    .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileToExist('dist/app.main.js'))
-    .then(() => expectFileToExist('dist/0.app.main.js'))
-    .then(() => expectFileToExist('dist/1.app.main.js'))
-    .then(() => expectFileToExist('dist/2.app.main.js'))
-    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 410000))
-    .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 40000))
-
-    // Verify that we're using the production environment.
-    .then(() => expectFileToMatch('dist/app.main.js', /PRODUCTION_ONLY/))
-    .then(() => expectToFail(() => expectFileToMatch('dist/app.main.js', /DEBUG_ONLY/)))
-
-    // Verify that we're using the debug environment now.
-    .then(() => updateJsonFile('webpack.flags.json', json => {
-      json['DEBUG'] = true;
-    }))
-    .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileToMatch('dist/app.main.js', /DEBUG_ONLY/))
-    .then(() => expectToFail(() => expectFileToMatch('dist/app.main.js', /PRODUCTION_ONLY/)))
-
-    .then(() => skipCleaning());
-}
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
index 204c8cd7fc99..fd2cf368dc50 100644
--- a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
@@ -10,13 +10,10 @@ export default async function () {
     return;
   }
 
-  process.env['NPM_CONFIG_REGISTRY'] = 'http://localhost:4873';
-
   await silentNpm(
     'install',
     '-g',
     '@angular-devkit/schematics-cli',
-    '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
 
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts b/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts
index 34125b932455..badc3a37cdf0 100644
--- a/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts
@@ -11,13 +11,10 @@ export default async function () {
     return;
   }
 
-  process.env['NPM_CONFIG_REGISTRY'] = 'http://localhost:4873';
-
   await silentNpm(
     'install',
     '-g',
     '@angular-devkit/schematics-cli',
-    '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
 
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts b/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts
index 148f804cbeaa..4c4993b4b0c3 100644
--- a/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts
@@ -11,13 +11,10 @@ export default async function () {
     return;
   }
 
-  process.env['NPM_CONFIG_REGISTRY'] = 'http://localhost:4873';
-
   await silentNpm(
     'install',
     '-g',
     '@angular-devkit/schematics-cli',
-    '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
 
diff --git a/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts b/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
deleted file mode 100644
index c7abf7c66d97..000000000000
--- a/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ng, killAllProcesses } from '../../utils/process';
-import { expectToFail } from '../../utils/utils';
-import { ngServe } from '../../utils/project';
-import { updateJsonFile } from '../../utils/project';
-
-
-export default function () {
-  // TODO(architect): Figure out why this test is not working.
-  return;
-
-  return Promise.resolve()
-    .then(() => expectToFail(() => ng('e2e', 'test-project-e2e', '--devServerTarget=')))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.serve.options.port = 4400;
-    }))
-    .then(() => ngServe())
-    .then(() => ng('e2e', 'test-project-e2e', '--devServerTarget=', '--base-url=http://localhost:4400'))
-    .then(() => ng('e2e', 'test-project-e2e', '--devServerTarget=', '--port=4400'))
-    .then(() => killAllProcesses(), (err: any) => {
-      killAllProcesses();
-      throw err;
-    });
-}
diff --git a/tests/legacy-cli/e2e/tests/test/test-assets.ts b/tests/legacy-cli/e2e/tests/test/test-assets.ts
deleted file mode 100644
index d647d07f8d0e..000000000000
--- a/tests/legacy-cli/e2e/tests/test/test-assets.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { writeMultipleFiles } from '../../utils/fs';
-import { ng } from '../../utils/process';
-import { updateJsonFile } from '../../utils/project';
-import { expectToFail } from '../../utils/utils';
-import { stripIndent } from 'common-tags';
-
-// Make sure asset files are served
-export default function () {
-  // TODO(architect): Figure out why this test is not working.
-  return;
-
-  return Promise.resolve()
-    .then(() => writeMultipleFiles({
-      'src/assets/file.txt': 'assets-folder-content',
-      'src/file.txt': 'file-content',
-      // Not using `async()` in tests as it seemed to swallow `fetch()` errors
-      'src/app/app.component.spec.ts': stripIndent`
-        describe('Test Runner', () => {
-          const fetch = global['fetch'];
-          it('should serve files in assets folder', (done) => {
-            fetch('/assets/file.txt')
-              .then(response => response.text())
-              .then(fileText => {
-                expect(fileText).toMatch('assets-folder-content');
-                done();
-              });
-          });
-          it('should serve files explicitly added to assets array', (done) => {
-            fetch('/file.txt')
-              .then(response => response.text())
-              .then(fileText => {
-                expect(fileText).toMatch('file-content');
-                done();
-              });
-          });
-        });
-      `
-    }))
-    // Test failure condition (no assets in angular.json)
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      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'].architect;
-      appArchitect.build.options.assets = [
-        { 'glob': '**/*', 'input': 'src/assets' },
-        { 'glob': 'file.txt' },
-      ];
-    }))
-    .then(() => ng('test', '--watch=false'));
-}
diff --git a/tests/legacy-cli/e2e/tests/test/test-karma-5.ts b/tests/legacy-cli/e2e/tests/test/test-karma-5.ts
new file mode 100644
index 000000000000..6915120722c2
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/test/test-karma-5.ts
@@ -0,0 +1,11 @@
+import { ng } from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+
+/**
+ * Ensure karma 5.2 continues to function
+ */
+export default async function () {
+  await installPackage('karma@5.2');
+
+  await ng('test', '--watch=false');
+}
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.0-yarn.ts b/tests/legacy-cli/e2e/tests/update/update-1.0-yarn.ts
deleted file mode 100644
index 93e36f41f819..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update-1.0-yarn.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { createProjectFromAsset } from '../../utils/assets';
-import { ng, silentYarn } 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'] : [];
-
-  const dir = await createProjectFromAsset('1.0-yarn-workspace-project', false, true);
-  process.chdir(`${dir}/packages/app`);
-  await useBuiltPackages();
-
-  process.chdir(dir);
-  await silentYarn('install');
-  process.chdir(`${dir}/packages/app`);
-
-  await useCIChrome('.');
-  await expectToFail(() => ng('build'));
-  await ng('update', '@angular/cli');
-  await useBuiltPackages();
-
-  process.chdir(dir);
-  await silentYarn('install');
-  process.chdir(`${dir}/packages/app`);
-
-  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/update/update-1.0.ts b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
deleted file mode 100644
index bc9cf4b51dc5..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update-1.0.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createProjectFromAsset } from '../../utils/assets';
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng } 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'] : [];
-
-  await createProjectFromAsset('1.0-project');
-
-  await useCIChrome('.');
-  await expectToFail(() => ng('build'));
-  await ng('update', '@angular/cli');
-  await useBuiltPackages();
-  await installWorkspacePackages(false);
-  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/update/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
deleted file mode 100644
index 9272ceede007..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createProjectFromAsset } from '../../utils/assets';
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng } from '../../utils/process';
-import { isPrereleaseCli, useBuiltPackages } from '../../utils/project';
-import { expectToFail } from '../../utils/utils';
-
-export default async function() {
-  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
-
-  await createProjectFromAsset('1.7-project');
-
-  await expectToFail(() => ng('build'));
-  await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
-  await useBuiltPackages();
-  await installWorkspacePackages(false);
-  await ng('update', '@angular/core', ...extraUpdateArgs);
-  await ng('build');
-}
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.7.ts b/tests/legacy-cli/e2e/tests/update/update-1.7.ts
deleted file mode 100644
index 41f2c02e463f..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update-1.7.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as fs from 'fs';
-import { createProjectFromAsset } from '../../utils/assets';
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng } 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'] : [];
-
-  await createProjectFromAsset('1.7-project');
-  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
-
-  await useCIChrome('.');
-  await expectToFail(() => ng('build'));
-  await ng('update', '@angular/cli');
-  await useBuiltPackages();
-  await installWorkspacePackages(false);
-  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/tests/update/update-7.0.ts b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
deleted file mode 100644
index a00962bf7108..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update-7.0.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { createProjectFromAsset } from '../../utils/assets';
-import { expectFileMatchToExist, expectFileToExist, expectFileToMatch } from '../../utils/fs';
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng, noSilentNg, silentNpm } from '../../utils/process';
-import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
-import { expectToFail } from '../../utils/utils';
-
-export default async function() {
-  await createProjectFromAsset('7.0-project');
-  await ng('update', '@angular/cli', '--migrate-only', '--from=7');
-
-  // 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 expectToFail(() => expectFileToExist('e2e/browserlist'));
-  // 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/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 installWorkspacePackages(false);
-
-  // Update Angular.
-  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
-  await ng('update', '@angular/core', ...extraUpdateArgs);
-  await silentNpm('run', 'webdriver-update');
-
-  // 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/tests/update/update-8.ts b/tests/legacy-cli/e2e/tests/update/update-8.ts
new file mode 100644
index 000000000000..f0c1dbd11225
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/update/update-8.ts
@@ -0,0 +1,45 @@
+import { createProjectFromAsset } from '../../utils/assets';
+import { expectFileMatchToExist } from '../../utils/fs';
+import { installPackage, installWorkspacePackages, setRegistry } from '../../utils/packages';
+import { ng, noSilentNg } from '../../utils/process';
+import { isPrereleaseCli, useCIChrome, useCIDefaults } from '../../utils/project';
+
+export default async function () {
+  await createProjectFromAsset('8.0-project', true, true);
+  await installWorkspacePackages();
+
+  // Update Angular to 9
+  await installPackage('@angular/cli@8');
+  const { stdout } = await ng('update', '@angular/cli@9.x', '@angular/core@9.x');
+  if (!stdout.includes("Executing migrations of package '@angular/cli'")) {
+    throw new Error('Update did not execute migrations. OUTPUT: \n' + stdout);
+  }
+
+  // Update Angular to 10
+  await ng('update', '@angular/cli@10', '@angular/core@10');
+
+  // Update Angular current build
+  const extraUpdateArgs = isPrereleaseCli() ? ['--next', '--force'] : ['--force'];
+  // For the latest/next release we purposely don't add `@angular/core`.
+  // This is due to our bumping strategy, which causes a period were `@angular/cli@latest` (v12.0.0) `@angular/core@latest` (v11.2.x)
+  // are of different major/minor version on the local NPM server. This causes `ng update` to fail.
+  // NB: `ng update @angula/cli` will still cause `@angular/core` packages to be updated.
+  await ng('update', '@angular/cli', ...extraUpdateArgs);
+
+  // Setup testing to use CI Chrome.
+  await useCIChrome('./');
+  await useCIChrome('./e2e/');
+  await useCIDefaults('eight-project');
+
+  // 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/eight-project/', /main-es5\.[0-9a-f]{20}\.js/);
+  await expectFileMatchToExist('dist/eight-project/', /main-es2015\.[0-9a-f]{20}\.js/);
+}
diff --git a/tests/legacy-cli/e2e/tests/update/update.ts b/tests/legacy-cli/e2e/tests/update/update.ts
deleted file mode 100644
index b06f6d84fb95..000000000000
--- a/tests/legacy-cli/e2e/tests/update/update.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng } from '../../utils/process';
-import { readFile, writeFile } from '../../utils/fs';
-import { updateJsonFile } from '../../utils/project';
-
-
-export default function () {
-  // Disable this e2e as it takes about 10 minutes on a good computer and is flaky.
-  if (!process.env['E2E_UPDATE']) {
-    return Promise.resolve();
-  }
-
-  let origPackageJson: string;
-  let origCoreVersion: string;
-  let origCliVersion: string;
-  let origTypeScriptVersion: string;
-
-  function updateVersions(obj: any) {
-    const keys = Object.keys(obj);
-    keys.forEach(key => {
-      if (key.startsWith('@angular/')) {
-        obj[key] = '2.1.0';
-      }
-    });
-  }
-
-  return readFile('package.json')
-    .then((content) => origPackageJson = content)
-    .then(() => updateJsonFile('package.json', obj => {
-      origCoreVersion = obj.dependencies['@angular/core'];
-      origCliVersion = obj.devDependencies['@angular/cli'];
-      origTypeScriptVersion = obj.devDependencies['typescript'];
-      obj.devDependencies['@angular/cli'] = '1.6.5';
-      obj.devDependencies['typescript'] = '2.0.2';
-      obj.dependencies['rxjs'] = '5.0.0-beta.12';
-    }))
-    .then(() => ng('update', '@angular/cli', 'typescript'))
-    .then(() => readFile('package.json'))
-    .then(s => {
-      const obj = JSON.parse(s);
-      if (origCliVersion === obj.devDependencies['@angular/cli']) {
-        throw new Error('CLI version not updated');
-      }
-      if (origTypeScriptVersion === obj.devDependencies['typescript']) {
-        throw new Error('TypeScript version not updated');
-      }
-    })
-    .then(() => writeFile('package.json', origPackageJson))
-    .then(() => installWorkspacePackages());
-}
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/legacy-cli/e2e/utils/assets.ts
index 80a7851a78b4..e2d3f2f0a969 100644
--- a/tests/legacy-cli/e2e/utils/assets.ts
+++ b/tests/legacy-cli/e2e/utils/assets.ts
@@ -49,11 +49,14 @@ export async function createProjectFromAsset(
   process.chdir(dir);
   if (!useNpmPackages) {
     await useBuiltPackages();
-    await writeFile('.npmrc', 'registry = http://localhost:4873', 'utf8');
+    if (!getGlobalVariable('ci')) {
+      const testRegistry = getGlobalVariable('package-registry');
+      await writeFile('.npmrc', `registry=${testRegistry}`);
+    }
   }
 
   if (!skipInstall) {
-    await installWorkspacePackages(false);
+    await installWorkspacePackages();
   }
 
   return dir;
diff --git a/tests/legacy-cli/e2e/utils/packages.ts b/tests/legacy-cli/e2e/utils/packages.ts
index 4107f4d5d3bc..bf1069b6ad2b 100644
--- a/tests/legacy-cli/e2e/utils/packages.ts
+++ b/tests/legacy-cli/e2e/utils/packages.ts
@@ -1,5 +1,6 @@
 import { getGlobalVariable } from './env';
-import { ProcessOutput, silentNpm, silentYarn } from './process';
+import { writeFile } from './fs';
+import { npm, ProcessOutput, silentNpm, silentYarn } from './process';
 
 export function getActivePackageManager(): 'npm' | 'yarn' {
   const value = getGlobalVariable('package-manager');
@@ -10,29 +11,24 @@ export function getActivePackageManager(): 'npm' | 'yarn' {
   return value || 'npm';
 }
 
-export async function installWorkspacePackages(updateWebdriver = true): Promise<void> {
+export async function installWorkspacePackages(): Promise<void> {
   switch (getActivePackageManager()) {
     case 'npm':
       await silentNpm('install');
-      if (updateWebdriver) {
-        await silentNpm('run', 'webdriver-update');
-      }
       break;
     case 'yarn':
       await silentYarn();
-      if (updateWebdriver) {
-        await silentYarn('webdriver-update');
-      }
       break;
   }
 }
 
-export async function installPackage(specifier: string): Promise<ProcessOutput> {
+export async function installPackage(specifier: string, registry?: string): Promise<ProcessOutput> {
+  const registryOption = registry ? [`--registry=${registry}`] : [];
   switch (getActivePackageManager()) {
     case 'npm':
-      return silentNpm('install', specifier);
+      return silentNpm('install', specifier, ...registryOption);
     case 'yarn':
-      return silentYarn('add', specifier);
+      return silentYarn('add', specifier, ...registryOption);
   }
 }
 
@@ -44,3 +40,21 @@ export async function uninstallPackage(name: string): Promise<ProcessOutput> {
       return silentYarn('remove', name);
   }
 }
+
+export async function setRegistry(useTestRegistry: boolean): Promise<void> {
+  const url = useTestRegistry
+    ? getGlobalVariable('package-registry')
+    : 'https://registry.npmjs.org';
+
+  const isCI = getGlobalVariable('ci');
+
+  // Ensure local test registry is used when outside a project
+  if (isCI) {
+    // Safe to set a user configuration on CI
+    await npm('config', 'set', 'registry', url);
+  } else {
+    // Yarn does not use the environment variable so an .npmrc file is also required
+    await writeFile('.npmrc', `registry=${url}`);
+    process.env['NPM_CONFIG_REGISTRY'] = url;
+  }
+}
diff --git a/tests/legacy-cli/e2e/utils/process.ts b/tests/legacy-cli/e2e/utils/process.ts
index 244ff1086534..add60058cb17 100644
--- a/tests/legacy-cli/e2e/utils/process.ts
+++ b/tests/legacy-cli/e2e/utils/process.ts
@@ -187,7 +187,7 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
 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 (['build', 'serve', 'test', 'e2e', 'extract-i18n'].indexOf(args[0]) != -1) {
     if (args[0] == 'e2e') {
       // Wait 1 second before running any end-to-end test.
       return new Promise(resolve => setTimeout(resolve, 1000))
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 02d10a15264d..f0bc9cbc1213 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -7,9 +7,6 @@ import { gitCommit } from './git';
 import { installWorkspacePackages } from './packages';
 import { execAndWaitForOutputToMatch, git, ng, npm } from './process';
 
-const tsConfigPath = 'tsconfig.json';
-
-
 export function updateJsonFile(filePath: string, fn: (json: any) => any | void) {
   return readFile(filePath)
     .then(tsConfigJson => {
@@ -23,14 +20,14 @@ export function updateJsonFile(filePath: string, fn: (json: any) => any | void)
 
 
 export function updateTsConfig(fn: (json: any) => any | void) {
-  return updateJsonFile(tsConfigPath, fn);
+  return updateJsonFile('tsconfig.json', fn);
 }
 
 
 export function ngServe(...args: string[]) {
   return execAndWaitForOutputToMatch('ng',
     ['serve', ...args],
-    /: Compiled successfully./);
+    / Compiled successfully./);
 }
 
 
@@ -90,12 +87,10 @@ export async function prepareProjectForE2e(name) {
     await useSha();
   }
 
-  await writeFile('.npmrc', 'registry=http://localhost:4873');
-
   console.log(
     `Project ${name} created... Installing npm.`,
   );
-  await installWorkspacePackages(false);
+  await installWorkspacePackages();
   await useCIDefaults(
     name,
   );
@@ -244,16 +239,7 @@ export function useCIDefaults(projectName = 'test-project') {
       const e2eTargets = e2eProject.targets || e2eProject.architect;
       e2eTargets.e2e.options.webdriverUpdate = false;
     }
-  })
-    .then(() => updateJsonFile('package.json', json => {
-      // Use matching versions of Chromium and ChromeDriver.
-      // https://github.com/GoogleChrome/puppeteer/releases
-      // http://chromedriver.chromium.org/downloads
-      json['scripts']['webdriver-update'] = 'webdriver-manager update' +
-        ` --standalone false --gecko false --versions.chrome 81.0.4044.0`; // Supports Chrome 81
-
-    }))
-    .then(() => npm('run', 'webdriver-update'));
+  });
 }
 
 export function useCIChrome(projectDir: string) {
@@ -261,32 +247,36 @@ export function useCIChrome(projectDir: string) {
   const protractorConf = `${dir}protractor.conf.js`;
   const karmaConf = `${dir}karma.conf.js`;
 
+  const chromePath = require('puppeteer').executablePath();
+  const chromeDriverPath = require('webdriver-manager/selenium/update-config.json').chrome.last;
+
   return Promise.resolve()
     .then(() => updateJsonFile('package.json', json => {
-      // Use matching versions of Chromium (via puppeteer) and ChromeDriver.
-      // https://github.com/GoogleChrome/puppeteer/releases
-      // http://chromedriver.chromium.org/downloads
-      json['devDependencies']['puppeteer'] = '3.0.2'; // Chromium 81.0.4044.0 (r737027)
       json['devDependencies']['karma-chrome-launcher'] = '~3.1.0';
     }))
     // Use Pupeteer in protractor if a config is found on the project.
-    .then(() => {
+    .then(async () => {
       if (fs.existsSync(protractorConf)) {
-        return replaceInFile(protractorConf,
+        await replaceInFile(protractorConf,
           `browserName: 'chrome'`,
           `browserName: 'chrome',
           chromeOptions: {
             args: ['--headless'],
-            binary: require('puppeteer').executablePath()
+            binary: String.raw\`${chromePath}\`,
           }
         `);
+        await replaceInFile(
+          protractorConf,
+          'directConnect: true,',
+          `directConnect: true, chromeDriver: String.raw\`${chromeDriverPath}\`,`,
+        );
       }
     })
     // 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();`)
+          `process.env.CHROME_BIN = String.raw\`${chromePath}\`;`)
           .then(() => replaceInFile(karmaConf,
             `browsers: ['Chrome']`,
             `browsers: ['Chrome'],
@@ -300,9 +290,8 @@ export function useCIChrome(projectDir: string) {
     });
 }
 
-export async function isPrereleaseCli() {
-  const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
-  const pre = prerelease(angularCliPkgJson.version);
+export function isPrereleaseCli(): boolean {
+  const pre = prerelease(packages['@angular/cli'].version);
 
   return pre && pre.length > 0;
 }
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index d5ff300bf0a0..118824f509cc 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -143,7 +143,9 @@ if (testsToRun.length == allTests.length) {
 }
 
 setGlobalVariable('argv', argv);
+setGlobalVariable('ci', process.env['CI']?.toLowerCase() === 'true' || process.env['CI'] === '1');
 setGlobalVariable('package-manager', argv.yarn ? 'yarn' : 'npm');
+setGlobalVariable('package-registry', 'http://localhost:4873');
 
 // Setup local package registry
 const registryPath =
diff --git a/tests/schematics/update/packages/update-migrations/v1_5.js b/tests/schematics/update/packages/update-migrations/v1_5.js
index 7e79eda93d49..123e9657930b 100644
--- a/tests/schematics/update/packages/update-migrations/v1_5.js
+++ b/tests/schematics/update/packages/update-migrations/v1_5.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index e53b179f706f..512d353ef376 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -14,6 +14,7 @@ nodejs_binary(
         "@npm//quicktype-core",
     ],
     entry_point = "quicktype_runner.js",
+    templated_args = ["--bazel_patch_module_resolver"],
 )
 
 platform(
diff --git a/tools/npm_integration_test/test_runner.js b/tools/npm_integration_test/test_runner.js
index f1bb67ebc4e1..0427f3a6017c 100644
--- a/tools/npm_integration_test/test_runner.js
+++ b/tools/npm_integration_test/test_runner.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
index d2e37b6fe48d..c555928c343d 100644
--- a/tools/quicktype_runner.js
+++ b/tools/quicktype_runner.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -96,8 +96,8 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
 
 /**
  * Create the TS file from the schema, and overwrite the outPath (or log).
- * @param {string} inPath 
- * @param {string} outPath 
+ * @param {string} inPath
+ * @param {string} outPath
  */
 async function main(inPath, outPath) {
   const content = await generate(inPath);
diff --git a/tools/rebase-pr.js b/tools/rebase-pr.js
index e74b6156d9c0..dbbcafc7e5b2 100644
--- a/tools/rebase-pr.js
+++ b/tools/rebase-pr.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -89,4 +89,4 @@ return Promise.resolve()
     console.log('Failed to rebase on top or target branch.\n');
     console.error(err);
     process.exitCode = 1;
-  });
\ No newline at end of file
+  });
diff --git a/tools/yarn/check-yarn.js b/tools/yarn/check-yarn.js
index 2e7d66ef63c4..8fc301063902 100644
--- a/tools/yarn/check-yarn.js
+++ b/tools/yarn/check-yarn.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
diff --git a/tsconfig.json b/tsconfig.json
index e1beec82437e..08116ccb5bbf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,13 +43,21 @@
       "@angular-devkit/build-webpack": [ "./packages/angular_devkit/build_webpack/src/index" ],
       "@ngtools/webpack": [ "./packages/ngtools/webpack/src/index" ],
       "@schematics/angular": [ "./packages/schematics/angular/index" ]
-    }
+    },
+    "plugins": [
+      {
+        "name": "@bazel/tsetse",
+        "disabledRules": [
+          "must-type-assert-json-parse"
+        ]
+      }
+    ]
   },
   "bazelOptions": {
     "suppressTsconfigOverrideWarnings": true
   },
   "exclude": [
-    "packages/angular_devkit/build_angular/src/typings.d.ts",
+    "packages/angular_devkit/build_angular/src/bazel-babel.d.ts",
     "bazel-out/**/*",
     "dist/**/*",
     "dist-schema/**",
diff --git a/tslint.json b/tslint.json
index 43991acec74a..ee2968d79de4 100644
--- a/tslint.json
+++ b/tslint.json
@@ -80,7 +80,6 @@
     ],
     "eofline": true,
     "import-spacing": true,
-    "match-default-export-name": true,
     "newline-before-return": true,
     "no-consecutive-blank-lines": [true, 2],
     "no-duplicate-variable": true,
@@ -135,7 +134,10 @@
     "curly": true,
     "file-header": [
       true,
-      "Copyright Google Inc\\. All Rights Reserved\\."
+      {
+        "match": "Copyright Google LLC",
+        "allow-single-line-comments": false
+      }
     ],
     "variable-name": [
       true,
diff --git a/yarn.lock b/yarn.lock
index f2b743f63b87..64fcd080557f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.0-next.6.tgz#4ee52b17d2280664c698e377d5a3f43061441ce5"
-  integrity sha512-x+7TX2JrMINqUc7qFLsV/IVjv0XU6YfqmVprpzPxyYIY9ofYyGgsX4gesYG8tkmRxyrw5BZaMsYkgPZ8jngwgA==
+"@angular/animations@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0-next.0.tgz#3c2d2a07e32c5d364f93fa8da4a924a6eeb7fb95"
+  integrity sha512-QVqedsA1mb8MV/7+gQUJdcrk4xnwqKGqIBj+ucoABRxj1Gx8o+3qLlba2ZH+vXwCJldqZdYsSkGd4ODu1bEczA==
   dependencies:
     tslib "^2.0.0"
 
@@ -17,26 +17,26 @@
     "@angular/core" "^10.0.0-0 || ^11.0.0"
     reflect-metadata "^0.1.13"
 
-"@angular/cdk@10.2.5":
-  version "10.2.5"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-10.2.5.tgz#768204ff4db1282297d15f382970f151f87434ec"
-  integrity sha512-SI/YdaxfkttG92A0uGRixyJkfTKHn0GIU+7BCSRq0d31ru3Ugfln+jr+5/xttxWr88CNPTfpGaUt0ZuSqYCzqw==
+"@angular/cdk@11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.1.1.tgz#87cf1ff8eef898296129742b503bff1f979b7bc1"
+  integrity sha512-rIog+eqv6RtpSWKM+iHQ5oHyOALMxRXkeTiJyvPfBCYQ2hzPN16+eNxP/JOR+C4y7pMaJyPur0pC572IZEnCsw==
   dependencies:
     tslib "^2.0.0"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.0.0-next.6.tgz#fecae0da927c596df5f936fff0751d1543503ee8"
-  integrity sha512-93RCH6yS0QbGzEjcl/Pwz04M35ddAY5NIInrUnz+BsuwFklu1EhvOTZqm9WFKT1gsSaQf1o45hVI1nAhiK7b+Q==
+"@angular/common@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0-next.0.tgz#6943f3cdcda13645abbf3a278119447a3405027b"
+  integrity sha512-GoE+XbyzsbZScXQ6IYQ8Vl7MCw1prIgTI8BFdr39gi1Sdkj44upuvhFQWtCqaexXtOuUT3HX//e1LbjljOtrAA==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/compiler-cli@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.0.0-next.6.tgz#f9c8e70b045f2f602dbd9aa66bf7e9545442b48b"
-  integrity sha512-hJBVI3cMUAV0VvFsXRkqKsX0Qg6TMFP5z1ThGmRjlwVYRZrQH6LtfApzB80UT9nqpAgPtdhikSoDNT3my3JJ5g==
+"@angular/compiler-cli@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.0-next.0.tgz#75dbc4dfa2c363f82fd06a3eb99bf966b143c44a"
+  integrity sha512-GyawTOXOXA50NwJzqh1+xzEaNNyvJv4qFcqAM52J2j1MSJwNwdO85CPC/2F2RyhUCRczoRosFgQrqF7E4xNCog==
   dependencies:
     "@babel/core" "^7.8.6"
     "@babel/types" "^7.8.6"
@@ -52,12 +52,12 @@
     source-map "^0.6.1"
     sourcemap-codec "^1.4.8"
     tslib "^2.0.0"
-    yargs "15.3.0"
+    yargs "^16.1.1"
 
-"@angular/compiler@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.0-next.6.tgz#d2c1d771e7ec4a12cece0dac1dccecb55ec7b7ff"
-  integrity sha512-6xAKXPeeIQH6kS/4r8eXn67zoq2fng6Ql+rdYMJul7ELK3kCk1IGxgECFb+eA6PtvAXkM+71eD1k7VJliEQr8A==
+"@angular/compiler@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0-next.0.tgz#01b2912ebd52baaccb9c819299cd75db22dccb9f"
+  integrity sha512-4KMjtTEut2I5yGtMBilU9FUsmlxVkFVHiixl20n66F1XSVT02sUmVejzB3gHITJOP/7jvJ6408HNwGZr1rS1dQ==
   dependencies:
     tslib "^2.0.0"
 
@@ -66,10 +66,10 @@
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5"
   integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==
 
-"@angular/core@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.0.0-next.6.tgz#bf5bd47e8319c9348d52cac00f24cb9a070d78d3"
-  integrity sha512-f0Q/Z3V2PnCVnBupXJmfxqPfJskxn+WEjMtO4vacrrqJ9lqScXPb8xJXo0+vgA+M5CZG5C9uXBHhH+Y+Ks7Kxw==
+"@angular/core@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0-next.0.tgz#cbda524dec0e7c804c66e18790bbc844e0297d1b"
+  integrity sha512-cqIOgzUj38JsEVfi9TCjv5YbpeBq3j95KKndzX6uMAqkaifUSsV0NK1b7EB3Y+qtnXPmpR973A1BEnX+VyIEWA==
   dependencies:
     tslib "^2.0.0"
 
@@ -79,15 +79,15 @@
   integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==
 
 "@angular/core@^10.0.0-0 || ^11.0.0":
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.1.5.tgz#2a855edc013237db93d18620ad3d4d74ef4a11b4"
-  integrity sha512-B8j1B5vkBmzyan78kMJhw7dfhe7znmujbeDU7qRgRcIllc9pVJv7D133Yze6JFiLVg21PfyFYs8FBJNeq39hxQ==
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.1.tgz#62bf9ad93d5d88afacce3ea5b03803ec5790d20b"
+  integrity sha512-yBBLekXeDviZ+KW3DmGeOK0CK/yQ9gCy2uHY47KUDI4UTRRLz0NI5nS9NdKwk5bpCPId6ZPNsJtHPBFXRhAnNA==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#d79eccd725b4421e50b566bf001f553b561e3813":
+"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#0fd0f441648577e8c3966e9b59a88fefe350f514":
   version "0.0.0"
-  resolved "https://github.com/angular/dev-infra-private-builds.git#d79eccd725b4421e50b566bf001f553b561e3813"
+  resolved "https://github.com/angular/dev-infra-private-builds.git#811862c9cdc0cd34e6936815f0c7db7fcc8213f5"
   dependencies:
     "@angular/benchpress" "0.2.1"
     "@bazel/buildifier" "^0.29.0"
@@ -103,115 +103,110 @@
     inquirer-autocomplete-prompt "^1.0.2"
     minimatch "^3.0.4"
     multimatch "^4.0.0"
-    node-fetch "^2.6.0"
+    node-fetch "^2.6.1"
     node-uuid "1.4.8"
     ora "^5.0.0"
     protractor "^5.4.2"
     selenium-webdriver "3.5.0"
     semver "^6.3.0"
-    shelljs "^0.8.3"
+    shelljs "^0.8.4"
     ts-node "^8.6.2"
-    tslib "^2.0.0"
+    tslib "^2.1.0"
     typed-graphqlify "^2.3.0"
-    typescript "~4.0.2"
+    typescript "~4.2.3"
     yaml "^1.10.0"
-    yargs "^15.4.1"
+    yargs "^16.1.1"
 
-"@angular/forms@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.0.0-next.6.tgz#d2abf717e6eeada1792efce8e532fe333404e08e"
-  integrity sha512-lcIuOCAaOQh2rWO+/cVxeBZMZxGnN6INEVeu4rcXwM4WqJ18z5WUpTQCke/WFG+VdZWKs5hb0Z1ZSUxaclacHg==
+"@angular/forms@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0-next.0.tgz#bfd43435994890b7db29be477fe45b741d210f77"
+  integrity sha512-6A56rd3unp+9ZrEbpaPBi59Qa9wdPapvwjD5pZaWuvBBMDSYOZldGM5K43Phi1M9beUHLY4BZpNMUdiIDbcQZw==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/localize@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.0.0-next.6.tgz#c45d74de847531403dad888a534aac382e6c077f"
-  integrity sha512-7QCk/oXe3Vo3S+CyN85st1SoSii+r/43vA156EVhMFrxlqU2P/5EbXqy84a+It4irq9UFe4E0FPifZf3spj9jQ==
+"@angular/localize@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.2.0-next.0.tgz#fd918ced1af6f203424549f1f9e1c0b61e50465f"
+  integrity sha512-bzvbvcrmzj62tdDbzeveT/RIgm2Q0OemP8AzpqgScXt94qXErY5R8IBFv4k5IQQnQPXnBvONG1SB+HBRpfk+Fg==
   dependencies:
     "@babel/core" "7.8.3"
     glob "7.1.2"
-    yargs "15.3.0"
+    yargs "^16.1.1"
 
-"@angular/material@10.2.5":
-  version "10.2.5"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-10.2.5.tgz#bdfc0bfdbadbca47db2dfd0170b8a31a3484ffd7"
-  integrity sha512-gYFqpXdLLuRYb9N1jVj9Gig/AlqsEfT/m+RtzHm4mawmHqeQbEV+0C0Qvc6fKRb1060Nkzfz8TDNGu5B+Xzq5A==
+"@angular/material@11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.1.1.tgz#06104a6e456c3e56a1375fbb2890bed5d25d634b"
+  integrity sha512-atQyGG1/Xz1Q4udmQ7HWOYCAl14evL29EWhsrk4q/5OAumqKMEcJI4Ro/Pgn0N31HpsT2zHyDsPYe0bnjy+/Ww==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/platform-browser-dynamic@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.0.0-next.6.tgz#31db216d92fcf182e35d3b17f0934ff03d6a0e69"
-  integrity sha512-CU3pyjKTdoobiUhh1FyqQCn2t5844irtaaSmdnwAUl6xlAV4JTZoqvJRME+imuhY8eAh+dhEjQCKYEu+4h5F0w==
+"@angular/platform-browser-dynamic@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0-next.0.tgz#0a5e510b12bcf28950a8c79373d684aa63d27229"
+  integrity sha512-UjW20x5XSDLwjTRw8X/CN5sjlkZyK0SwVx43XGGHXimzhklK7YD1zQxLC2mESq9k2YKSGOE4TeAE3u+KOxa3dg==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/platform-browser@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.0.0-next.6.tgz#543ae133745eea68d8894c9eca9814cc6754a1ec"
-  integrity sha512-ulo5BL2NyCEauZMaiLhX9aeQuVJ5KzrFunFJKDso25AEyA40kbOETB2v8U2f3QvMQoaUsBASp5weQMxfkhikBQ==
+"@angular/platform-browser@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0-next.0.tgz#3866639a7be42aa4417f5735121af5864ac7f982"
+  integrity sha512-thhZvNsCOyOZPT3C2oKROspRjUeCwbTJrgdNFJ2o1ndmmtlo6QqGrEZ5grZA3IGRNgSRRBr6cgpcUjj6ONmyBQ==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/platform-server@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.0.0-next.6.tgz#b7f1850433c862e920c43506d3fabdd0db6aac68"
-  integrity sha512-MeQYFxURXhU8EIybkm1u9G0Z7qkM0W4GlRGbMGY8iYhhv3I2G4d0m29MPFUaXm5UhF1JWtdrIGc/G/k2FtDRhw==
+"@angular/platform-server@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.2.0-next.0.tgz#fcda56bce6cbec7164480cf257373a16ac3292a4"
+  integrity sha512-0TOa6qnxMBp6wspvhjDgMr+6DeF591qNy2kKchS1Dd+8SEPP1BJvENrDfLJ1GsklL04LlDnGueE3AQhdZqxiTw==
   dependencies:
     domino "^2.1.2"
     tslib "^2.0.0"
     xhr2 "^0.2.0"
 
-"@angular/router@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.0.0-next.6.tgz#eb1954b85c854747fefd57fbe7a697e503a852ab"
-  integrity sha512-DTz0wMeZF4V3ORt7/yv1biTLYbVZXKYN+OJcB+sOmidK/OWK3E+QVc8a1/5eQvADNs1/Qns2RZskiSBkBQHaMQ==
+"@angular/router@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.0-next.0.tgz#e45f629f074106ba0db4ed246778c160bdae09fa"
+  integrity sha512-7r15ZCvugEupVB9R1FKjDQF0b0+W3LuNQUcHE33b8QgYs83xnUz22ykuSKY7Rlj4edU2W3dnu+8WSiYDXI7N9g==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/service-worker@11.0.0-next.6":
-  version "11.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.0.0-next.6.tgz#82236e729c5a9d3f08b424c61c2455e023e438bc"
-  integrity sha512-qGjs+eq4Z8a4ZIDco8P09fksi581Xe5qGUGhClNHxDpUzd/NlUsAJxMY+dSuceTWVK/aY3gGg71cCsM6JxFPmg==
+"@angular/service-worker@11.2.0-next.0":
+  version "11.2.0-next.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.2.0-next.0.tgz#006c8eca1014bbf807a02c7927d0b307e1bd415d"
+  integrity sha512-bJSYGXl0XpJmzGL2zTuw2//iwiAdKfz+ugVFPQhcRr1W5kP1IvvOCX+vZQv/08b7F4U/cH4p35yXuvSLIa2kwg==
   dependencies:
     tslib "^2.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11", "@babel/code-frame@^7.8.3":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
-  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
-  dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
+  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@7.11.6", "@babel/core@^7.7.5", "@babel/core@^7.8.6":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
-  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+"@babel/core@7.12.10", "@babel/core@^7.7.5", "@babel/core@^7.8.6":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.6"
-    "@babel/helper-module-transforms" "^7.11.0"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
@@ -236,21 +231,21 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@7.11.6", "@babel/generator@^7.11.5", "@babel/generator@^7.11.6", "@babel/generator@^7.8.3":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
-  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
+"@babel/generator@7.12.11", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11", "@babel/generator@^7.8.3":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
   dependencies:
-    "@babel/types" "^7.11.5"
+    "@babel/types" "^7.12.11"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
@@ -260,37 +255,34 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
-  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
+"@babel/helper-compilation-targets@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/compat-data" "^7.10.4"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
+    "@babel/compat-data" "^7.12.5"
+    "@babel/helper-validator-option" "^7.12.1"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
-  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+"@babel/helper-create-class-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
+  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
-  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+"@babel/helper-create-regexp-features-plugin@^7.12.1":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
+  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.0"
+    regexpu-core "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
   version "7.10.5"
@@ -302,27 +294,27 @@
     lodash "^4.17.19"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
-  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
+  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+"@babel/helper-get-function-arity@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -331,117 +323,115 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
-  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
+"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
+  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.12.7"
 
-"@babel/helper-module-imports@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
-  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.5"
 
-"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
-  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
+"@babel/helper-module-transforms@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-simple-access" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/types" "^7.11.0"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
-  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
-  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
-  dependencies:
-    lodash "^4.17.19"
-
-"@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.11.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
-  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
+"@babel/helper-remap-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
+  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-replace-supers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
-  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
+"@babel/helper-replace-supers@^7.12.1":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
+  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.4"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.12.7"
+    "@babel/helper-optimise-call-expression" "^7.12.10"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-simple-access@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
-  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+"@babel/helper-simple-access@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
   dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
-  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
+  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
 
 "@babel/helper-wrap-function@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
-  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
+  version "7.12.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
+  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.10.4", "@babel/helpers@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
-  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+"@babel/helpers@^7.12.5", "@babel/helpers@^7.8.3":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -452,116 +442,116 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.8.3":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
-  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.8.3":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
-"@babel/plugin-proposal-async-generator-functions@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
-  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566"
+  integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
-  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
+"@babel/plugin-proposal-class-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
+  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
-  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+"@babel/plugin-proposal-dynamic-import@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
+  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-export-namespace-from@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
-  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
+"@babel/plugin-proposal-export-namespace-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
+  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
-  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+"@babel/plugin-proposal-json-strings@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
+  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
-  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
+  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
-  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
+  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
-  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
+"@babel/plugin-proposal-numeric-separator@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
+  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
-  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.12.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
-  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
+"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
+  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
-  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-private-methods@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
-  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
+"@babel/plugin-proposal-private-methods@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
+  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
-  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
+  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
@@ -571,10 +561,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
-  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+"@babel/plugin-syntax-class-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -641,298 +631,296 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
-  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
+"@babel/plugin-syntax-top-level-await@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
-  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
+"@babel/plugin-transform-arrow-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
+  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
-  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
+"@babel/plugin-transform-async-to-generator@7.12.1", "@babel/plugin-transform-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
+  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
-  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
+"@babel/plugin-transform-block-scoped-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
+  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.10.4":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
-  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
+"@babel/plugin-transform-block-scoping@^7.12.11":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca"
+  integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
-  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
+"@babel/plugin-transform-classes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
+  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-define-map" "^7.10.4"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-optimise-call-expression" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
-  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
+"@babel/plugin-transform-computed-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
+  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
-  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
+"@babel/plugin-transform-destructuring@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
+  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
-  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
+"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
+  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
-  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
+"@babel/plugin-transform-duplicate-keys@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
+  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
-  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
+"@babel/plugin-transform-exponentiation-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
+  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
-  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
+"@babel/plugin-transform-for-of@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
+  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
-  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
+"@babel/plugin-transform-function-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
+  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
-  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
+"@babel/plugin-transform-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
+  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
-  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
+"@babel/plugin-transform-member-expression-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
+  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
-  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
+"@babel/plugin-transform-modules-amd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
+  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
-  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
+"@babel/plugin-transform-modules-commonjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
+  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-simple-access" "^7.12.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
-  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
+"@babel/plugin-transform-modules-systemjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
+  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
-  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
+"@babel/plugin-transform-modules-umd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
+  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
-  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
+  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
-"@babel/plugin-transform-new-target@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
-  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
+"@babel/plugin-transform-new-target@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
+  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
-  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
+"@babel/plugin-transform-object-super@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
+  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
 
-"@babel/plugin-transform-parameters@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
-  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
+"@babel/plugin-transform-parameters@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
+  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
-  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
+"@babel/plugin-transform-property-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
+  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
-  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
+"@babel/plugin-transform-regenerator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
+  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
-  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
+"@babel/plugin-transform-reserved-words@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
+  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz#f108bc8e0cf33c37da031c097d1df470b3a293fc"
-  integrity sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==
+"@babel/plugin-transform-runtime@7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
+  integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
-  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
+"@babel/plugin-transform-shorthand-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
+  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
-  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
+"@babel/plugin-transform-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
+  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
-"@babel/plugin-transform-sticky-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
-  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
+"@babel/plugin-transform-sticky-regex@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
+  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
-  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
+"@babel/plugin-transform-template-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
+  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
-  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
+"@babel/plugin-transform-typeof-symbol@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-escapes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
-  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
+"@babel/plugin-transform-unicode-escapes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
+  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
-  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+"@babel/plugin-transform-unicode-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
+  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz#18cb4b9379e3e92ffea92c07471a99a2914e4272"
-  integrity sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==
+"@babel/preset-env@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
+  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
   dependencies:
-    "@babel/compat-data" "^7.11.0"
-    "@babel/helper-compilation-targets" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/compat-data" "^7.12.7"
+    "@babel/helper-compilation-targets" "^7.12.5"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
-    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
-    "@babel/plugin-proposal-json-strings" "^7.10.4"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
-    "@babel/plugin-proposal-private-methods" "^7.10.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.11"
+    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
+    "@babel/plugin-proposal-json-strings" "^7.12.1"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
@@ -942,45 +930,42 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.4"
-    "@babel/plugin-transform-arrow-functions" "^7.10.4"
-    "@babel/plugin-transform-async-to-generator" "^7.10.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
-    "@babel/plugin-transform-block-scoping" "^7.10.4"
-    "@babel/plugin-transform-classes" "^7.10.4"
-    "@babel/plugin-transform-computed-properties" "^7.10.4"
-    "@babel/plugin-transform-destructuring" "^7.10.4"
-    "@babel/plugin-transform-dotall-regex" "^7.10.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
-    "@babel/plugin-transform-for-of" "^7.10.4"
-    "@babel/plugin-transform-function-name" "^7.10.4"
-    "@babel/plugin-transform-literals" "^7.10.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
-    "@babel/plugin-transform-modules-amd" "^7.10.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
-    "@babel/plugin-transform-modules-umd" "^7.10.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
-    "@babel/plugin-transform-new-target" "^7.10.4"
-    "@babel/plugin-transform-object-super" "^7.10.4"
-    "@babel/plugin-transform-parameters" "^7.10.4"
-    "@babel/plugin-transform-property-literals" "^7.10.4"
-    "@babel/plugin-transform-regenerator" "^7.10.4"
-    "@babel/plugin-transform-reserved-words" "^7.10.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
-    "@babel/plugin-transform-spread" "^7.11.0"
-    "@babel/plugin-transform-sticky-regex" "^7.10.4"
-    "@babel/plugin-transform-template-literals" "^7.10.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
-    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/plugin-syntax-top-level-await" "^7.12.1"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-async-to-generator" "^7.12.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.11"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-computed-properties" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-dotall-regex" "^7.12.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-function-name" "^7.12.1"
+    "@babel/plugin-transform-literals" "^7.12.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
+    "@babel/plugin-transform-modules-umd" "^7.12.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
+    "@babel/plugin-transform-new-target" "^7.12.1"
+    "@babel/plugin-transform-object-super" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-property-literals" "^7.12.1"
+    "@babel/plugin-transform-regenerator" "^7.12.1"
+    "@babel/plugin-transform-reserved-words" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.7"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
+    "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.11.5"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
+    "@babel/types" "^7.12.11"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -994,50 +979,50 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@7.11.2", "@babel/runtime@^7.8.4":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
-  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+"@babel/runtime@7.12.5", "@babel/runtime@^7.8.4":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7.10.4", "@babel/template@^7.10.4", "@babel/template@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.8.3":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
-  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+"@babel/template@7.12.7", "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.8.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
+
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.8.3":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
+  integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
+  dependencies:
+    "@babel/code-frame" "^7.12.11"
+    "@babel/generator" "^7.12.11"
+    "@babel/helper-function-name" "^7.12.11"
+    "@babel/helper-split-export-declaration" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/types" "^7.12.12"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
-  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
+  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@bazel/bazelisk@1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.7.2.tgz#80673d886ac46bf671f6b1908bf80a4eb84eb200"
-  integrity sha512-/cin20XIfSctNVh6veOVKFwUp6g6/oeEEvgPLSetgK6HFspReI3jI+2lO4haQX8yD2QFN20ndheXDuLYidoj6g==
+"@bazel/bazelisk@1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.7.3.tgz#51d99286326e15434ce10c54c1ee598c4ab1f694"
+  integrity sha512-A+QLZvKifKnbFawH5aaCnooPx0Ia5JS3S8SckKB034GVB3BjtUTCwjaxzxG3ARQ6Jq1vDcQwWgF2bjT9FjrdDg==
 
 "@bazel/buildifier-darwin_x64@0.29.0":
   version "0.29.0"
@@ -1054,10 +1039,10 @@
   resolved "https://registry.yarnpkg.com/@bazel/buildifier-win32_x64/-/buildifier-win32_x64-0.29.0.tgz#a63438c7a7d2dc593e626ed6e163e9d8ea93917a"
   integrity sha512-hnOQfPhQNAIqbrhsHT3MWAyAZSUhKwxzEuZJZoOsGrW8fPonhKysdvfZJqfqJ6vDVYaMJKvLnSO1c9QZRhU7kQ==
 
-"@bazel/buildifier@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-3.5.0.tgz#afbee61d61543d0a0a28e2b29a5cbdb64c852953"
-  integrity sha512-cbUS0/GMg57g6NIg6JekgmqVtuobYzW4aGHk7KzMS/bFZvxg6WY19JJ5UZSzGyAGDu2152oUTFbh4WN74Fz1+Q==
+"@bazel/buildifier@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-4.0.0.tgz#c99fb21295c7e2858fa176c2b950c589217ae8ac"
+  integrity sha512-e242AK+shp+5bpAc9l93pmG5YRYRfM0INV3gfbdxNeBxccx1MJUagaiwxqAV+Mw55zk92gsb99f2TAc9tt6C7w==
 
 "@bazel/buildifier@^0.29.0":
   version "0.29.0"
@@ -1068,18 +1053,18 @@
     "@bazel/buildifier-linux_x64" "0.29.0"
     "@bazel/buildifier-win32_x64" "0.29.0"
 
-"@bazel/jasmine@2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.2.1.tgz#4a1cc54b0092569104cf88fc1cbb27e34578cd90"
-  integrity sha512-l028iUpIbQ8WIWI+3OQpnBRa+NBKKrvtbrQNCrRv4+R305c4KAS2cGixIKI62CizD4nmhNAXRN/jE849I1g1zg==
+"@bazel/jasmine@3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-3.2.1.tgz#3a29b4a04222de2add06a57d771b9c2ecc97af80"
+  integrity sha512-VPz4AuK0DTk8kyiUzWrh36zGyaX1Yvq1vTNvc0TM8cXsQPRNsQbFTmQsy/y4quLvdJfk8P1qP9N95gqqkz9M9Q==
   dependencies:
-    c8 "~7.1.0"
+    c8 "~7.5.0"
     jasmine-reporters "~2.3.2"
 
-"@bazel/typescript@2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.2.1.tgz#46d6dcedd91a7fd0421e9286790aff94ec45bece"
-  integrity sha512-nFdwkJYzKsmu9IzbQ8Wtt6YI7AlTEv5JHWTbMmZB4HBOi7xjhgFKiq3HQRhZ963EVoJ481Kb6M0wtkzARCb3YA==
+"@bazel/typescript@3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.2.1.tgz#564849e2f05387612d13ef64304b7a7582bd107a"
+  integrity sha512-2KgMqKcbqL89WWWVC2iwTCS0tMWmQ4LpQgFhaF3Lp56Edl0nv/fy0TOu+waw2Qs2rTBbTVKhk5/9DRiqJmOd2g==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
@@ -1091,60 +1076,16 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@hapi/address@^2.1.2":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
-  integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
-
-"@hapi/formula@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
-  integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
-
-"@hapi/hoek@^8.2.4", "@hapi/hoek@^8.3.0":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
-  integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
-
-"@hapi/joi@^16.1.7":
-  version "16.1.8"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.8.tgz#84c1f126269489871ad4e2decc786e0adef06839"
-  integrity sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==
-  dependencies:
-    "@hapi/address" "^2.1.2"
-    "@hapi/formula" "^1.2.0"
-    "@hapi/hoek" "^8.2.4"
-    "@hapi/pinpoint" "^1.0.2"
-    "@hapi/topo" "^3.1.3"
-
-"@hapi/pinpoint@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
-  integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==
-
-"@hapi/topo@^3.1.3":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
-  integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
-  dependencies:
-    "@hapi/hoek" "^8.3.0"
+"@discoveryjs/json-ext@0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
+  integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
 
 "@istanbuljs/schema@^0.1.2":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jsdevtools/coverage-istanbul-loader@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz#102e414b02ae2f0b3c7fd45a705601e1fd4867c5"
-  integrity sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==
-  dependencies:
-    convert-source-map "^1.7.0"
-    istanbul-lib-instrument "^4.0.1"
-    loader-utils "^1.4.0"
-    merge-source-map "^1.1.0"
-    schema-utils "^2.6.4"
-
 "@jsdevtools/coverage-istanbul-loader@3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz#2a4bc65d0271df8d4435982db4af35d81754ee26"
@@ -1164,38 +1105,25 @@
     brfs "^1.4.0"
     unicode-trie "^0.3.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
   dependencies:
-    "@nodelib/fs.stat" "2.0.3"
+    "@nodelib/fs.stat" "2.0.4"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
-
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
+    "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
 "@npmcli/ci-detect@^1.0.0":
@@ -1229,37 +1157,60 @@
     readdir-scoped-modules "^1.1.0"
 
 "@npmcli/move-file@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
-  integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.1.tgz#31a3afae95308ef12f58ac147b3e33aae621241d"
+  integrity sha512-LtWTicuF2wp7PNTuyCwABx7nNG+DnzSE8gN0iWxkC6mpgm/iOPu0ZMTkXuCxmJxtWFsDxUaixM9COSNJEMUfuQ==
   dependencies:
     mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
-"@npmcli/promise-spawn@^1.1.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.2.0.tgz#167d70b926f771c8bd8b9183bfc8b5aec29d7e45"
-  integrity sha512-nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow==
+"@npmcli/node-gyp@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.1.tgz#dedc4ea9b3c6ef207081ebcd82c053ef60edc478"
+  integrity sha512-pBqoKPWmuk9iaEcXlLBVRIA6I1kG9JiICU+sG0NuD6NAR461F+02elHJS4WkQxHW2W5rnsfvP/ClKwmsZ9RaaA==
+
+"@npmcli/promise-spawn@^1.1.0", "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.0":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+  dependencies:
+    infer-owner "^1.0.4"
+
+"@npmcli/run-script@^1.3.0":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.1.tgz#729c5ac7293f250b654504d263952703af6da39c"
+  integrity sha512-G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA==
   dependencies:
+    "@npmcli/node-gyp" "^1.0.0"
+    "@npmcli/promise-spawn" "^1.3.0"
     infer-owner "^1.0.4"
+    node-gyp "^7.1.0"
+    puka "^1.0.1"
+    read-package-json-fast "^1.1.3"
 
 "@octokit/endpoint@^6.0.1":
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.8.tgz#91b07e236fdb69929c678c6439f7a560dc6058ac"
-  integrity sha512-MuRrgv+bM4Q+e9uEvxAB/Kf+Sj0O2JAOBA131uo1o6lgdq1iS8ejKwtqHgdfY91V3rN9R/hdGKFiQYMzVzVBEQ==
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1"
+  integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==
   dependencies:
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.3"
     is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
 "@octokit/graphql@^4.3.1":
-  version "4.5.6"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.6.tgz#708143ba15cf7c1879ed6188266e7f270be805d4"
-  integrity sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg==
+  version "4.5.9"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.9.tgz#2365831a1a88f4cb6fd4b0488edb6587d8243024"
+  integrity sha512-c+0yofIugUNqo+ktrLaBlWSbjSq/UF8ChAyxQzbD3X74k1vAuyLKdDJmPwVExUFSp6+U1FzWe+3OkeRsIqV0vg==
   dependencies:
     "@octokit/request" "^5.3.0"
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
+"@octokit/openapi-types@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-3.4.1.tgz#317f78cede7f387046e6bad2041e01ddf9607e96"
+  integrity sha512-7Sjm3UwEAM11f+ck9+qlyEfgl8hCk5sSZBU2qcWY8+8ibowjqcwxhhtvY0/pjHPF8mcvmedFpGmmIYs2qM9/+Q==
+
 "@octokit/request-error@^1.0.2":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801"
@@ -1270,22 +1221,22 @@
     once "^1.4.0"
 
 "@octokit/request-error@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0"
-  integrity sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143"
+  integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==
   dependencies:
-    "@octokit/types" "^5.0.1"
+    "@octokit/types" "^6.0.3"
     deprecation "^2.0.0"
     once "^1.4.0"
 
 "@octokit/request@^5.0.0", "@octokit/request@^5.3.0":
-  version "5.4.9"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.9.tgz#0a46f11b82351b3416d3157261ad9b1558c43365"
-  integrity sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==
+  version "5.4.13"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.13.tgz#eec5987b3e96f984fc5f41967e001170c6d23a18"
+  integrity sha512-WcNRH5XPPtg7i1g9Da5U9dvZ6YbTffw9BN2rVezYiE7couoSyaRsw0e+Tl8uk1fArHE7Dn14U7YqUDy59WaqEw==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.3"
     deprecation "^2.0.0"
     is-plain-object "^5.0.0"
     node-fetch "^2.6.1"
@@ -1318,13 +1269,21 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
+"@octokit/types@^5.0.1":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
   integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
   dependencies:
     "@types/node" ">= 8"
 
+"@octokit/types@^6.0.3":
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.7.0.tgz#a548ed7a5606620a55c4814e11d64e3d19285f47"
+  integrity sha512-QiE7y2Brh0Bv61K//kFGJ6jCZihCf4fGL1FP0Oims5h2SlSYtDiAQMJW15s8udyLfjo/jY05G1YlN8ED/c6RNw==
+  dependencies:
+    "@octokit/openapi-types" "^3.4.1"
+    "@types/node" ">= 8"
+
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -1378,10 +1337,10 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@rollup/plugin-commonjs@^15.0.0":
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz#1e7d076c4f1b2abf7e65248570e555defc37c238"
-  integrity sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==
+"@rollup/plugin-commonjs@^17.0.0":
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz#757ec88737dffa8aa913eb392fade2e45aef2a2d"
+  integrity sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     commondir "^1.0.1"
@@ -1391,24 +1350,24 @@
     magic-string "^0.25.7"
     resolve "^1.17.0"
 
-"@rollup/plugin-json@^4.0.0":
+"@rollup/plugin-json@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
   integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz#39bd0034ce9126b39c1699695f440b4b7d2b62e6"
-  integrity sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==
+"@rollup/plugin-node-resolve@^11.1.0":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz#47bc34252914794a1b06fb50371d7520a03f91f3"
+  integrity sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
     builtin-modules "^3.1.0"
     deepmerge "^4.2.2"
     is-module "^1.0.0"
-    resolve "^1.17.0"
+    resolve "^1.19.0"
 
 "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
@@ -1436,15 +1395,20 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@trysound/sax@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669"
+  integrity sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==
+
 "@types/anymatch@*":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
   integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
 
-"@types/babel__core@7.1.10":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+"@types/babel__core@7.1.12":
+  version "7.1.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
+  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1459,18 +1423,18 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@types/babel__template@*", "@types/babel__template@7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
-  integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==
+"@types/babel__template@*", "@types/babel__template@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
+  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1483,9 +1447,11 @@
     "@types/node" "*"
 
 "@types/browserslist@^4.4.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@types/browserslist/-/browserslist-4.8.0.tgz#60489aefdf0fcb56c2d8eb65267ff08dad7a526d"
-  integrity sha512-4PyO9OM08APvxxo1NmQyQKlJdowPCOQIy5D/NLO3aO0vGC57wsMptvGp3b8IbYnupFZr92l1dlVief1JvS6STQ==
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/@types/browserslist/-/browserslist-4.15.0.tgz#ba0265b33003a2581df1fc5f483321a30205f2d2"
+  integrity sha512-h9LyKErRGZqMsHh9bd+FE8yCIal4S0DxKTOeui56VgVXqa66TKiuaIUxCAI7c1O0LjaUzOTcsMyOpO9GetozRA==
+  dependencies:
+    browserslist "*"
 
 "@types/cacache@^12.0.1":
   version "12.0.1"
@@ -1514,6 +1480,11 @@
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
+"@types/component-emitter@^1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
+  integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
+
 "@types/connect-history-api-fallback@*":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.3.tgz#4772b79b8b53185f0f4c9deab09236baf76ee3b4"
@@ -1523,20 +1494,29 @@
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.33"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
-  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   dependencies:
     "@types/node" "*"
 
+"@types/cookie@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
+  integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==
+
 "@types/copy-webpack-plugin@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-6.0.0.tgz#ad4a4d7be859ba6a6adcb970aab3256a705cd049"
-  integrity sha512-Ousy+sNap1j44eG+C9FZvTUybpp9lFmKjBRF7L0NDs/+SDA9OXKo2OpsHJfD/LMWflz+uvfTCBXH1CgdL6AW/g==
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-6.4.0.tgz#225f86bc60a62052df39a110f7cbf7bc5156a0c1"
+  integrity sha512-f5mQG5c7xH3zLGrEmKgzLLFSGNB7Y4+4a+a1X4DvjgfbTEWEZUNNXUqGs5tBVCtb5qKPzm2z+6ixX3xirWmOCg==
   dependencies:
-    "@types/node" "*"
     "@types/webpack" "*"
 
+"@types/cors@^2.8.8":
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.9.tgz#4bd1fcac72eca8d5bec93e76c7fdcbdc1bc2cd4a"
+  integrity sha512-zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg==
+
 "@types/cssnano@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/cssnano/-/cssnano-4.0.0.tgz#f1bb29d6d0813861a3d87e02946b2988d0110d4e"
@@ -1550,31 +1530,31 @@
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
 
 "@types/estree@*":
-  version "0.0.45"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
-  integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
+  version "0.0.46"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
+  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
 
 "@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/express-serve-static-core@*":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084"
-  integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
+  version "4.17.18"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40"
+  integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@*", "@types/express@^4.16.0":
-  version "4.17.8"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a"
-  integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "*"
+    "@types/express-serve-static-core" "^4.17.18"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
@@ -1605,10 +1585,10 @@
     "@types/http-proxy" "*"
     "@types/node" "*"
 
-"@types/http-proxy@*":
-  version "1.17.4"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.4.tgz#e7c92e3dbe3e13aa799440ff42e6d3a17a9d045b"
-  integrity sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==
+"@types/http-proxy@*", "@types/http-proxy@^1.17.4":
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.5.tgz#c203c5e6e9dc6820d27a40eb1e511c70a220423d"
+  integrity sha512-GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==
   dependencies:
     "@types/node" "*"
 
@@ -1630,20 +1610,20 @@
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
   integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
 
-"@types/jasmine@~3.5.0":
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.14.tgz#f41a14e8ffa939062a71cf9722e5ee7d4e1f94af"
-  integrity sha512-Fkgk536sHPqcOtd+Ow+WiUNuk0TSo/BntKkF8wSvcd6M2FvPjeXcUE6Oz/bwDZiUZEaXLslAgw00Q94Pnx6T4w==
+"@types/jasmine@~3.6.0":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050"
+  integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA==
 
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
 "@types/karma@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/karma/-/karma-5.0.0.tgz#6750ffc633c0fbc63dfb725146f198e8c3afcd08"
-  integrity sha512-5quuLnxdJWkzJCEwFatOClM6O7EkeDWfXltGySb01LQnBVjtbLzIky9JLW0IKt+JfzurUjwj7b7Sb/Omsx4QYA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@types/karma/-/karma-5.0.1.tgz#daed1314723c4fa5eeef5275568d78f161733d0a"
+  integrity sha512-zSaPZ+ABVx/DQ5imAQZUITgLy19H0aAogknHU67JuDi2PvaXGjYBevFakkDtooBvr7dMsq/YD9vtOxMcSHWnxw==
   dependencies:
     "@types/node" "*"
     log4js "^4.0.0"
@@ -1655,10 +1635,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/license-checker-webpack-plugin@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@types/license-checker-webpack-plugin/-/license-checker-webpack-plugin-0.0.2.tgz#ee35e2b36a0eccea48254dc1bcc47429f8290384"
-  integrity sha512-ad6Z7r3PdexKQI1MQD3o7VVHPdfduZbTRiob7bKBKihZC6Z3BzKvoZjHWIpkkxXjk6SaEhPjWdDGYQbFtsCQBg==
+"@types/license-checker-webpack-plugin@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@types/license-checker-webpack-plugin/-/license-checker-webpack-plugin-0.0.3.tgz#20016a5ed6aec0a43a55e790713dbfc26f902c26"
+  integrity sha512-rbtXJfZPFdr7z6vOYAE/jhBmOiB7NQkS/dDtxv5Xor5mkB6Kml4l14quNSDolRUdDFM5xKx1AcpqtuUN+Nwc+Q==
   dependencies:
     "@types/webpack" "*"
 
@@ -1675,10 +1655,10 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
 
-"@types/mime@*":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
-  integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/minimatch@*", "@types/minimatch@3.0.3", "@types/minimatch@^3.0.3":
   version "3.0.3"
@@ -1686,22 +1666,22 @@
   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=
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
 "@types/node-fetch@^2.1.6":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
+  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>= 8":
-  version "14.11.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.8.tgz#fe2012f2355e4ce08bca44aeb3abbb21cf88d33f"
-  integrity sha512-KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw==
+"@types/node@*", "@types/node@>= 8", "@types/node@^14.14.10":
+  version "14.14.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
+  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
 
 "@types/node@10.12.30":
   version "10.12.30"
@@ -1709,9 +1689,9 @@
   integrity sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==
 
 "@types/node@^10.1.0":
-  version "10.17.39"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.39.tgz#ce1122758d0608de8303667cebf171f44192629b"
-  integrity sha512-dJLCxrpQmgyxYGcl0Ae9MTsQgI22qHHcGFj/8VKu7McJA5zQpnuGjoksnxbo1JxSjW/Nahnl13W8MYZf01CZHA==
+  version "10.17.51"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.51.tgz#639538575befbcf3d3861f95c41de8e47124d674"
+  integrity sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1744,9 +1724,9 @@
     "@types/parse5" "*"
 
 "@types/parse5@*":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
-  integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.0.tgz#38590dc2c3cf5717154064e3ee9b6947ee21b299"
+  integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA==
 
 "@types/pidusage@^2.0.1":
   version "2.0.1"
@@ -1790,13 +1770,20 @@
     "@types/tough-cookie" "*"
     form-data "^2.5.0"
 
-"@types/resolve@1.17.1", "@types/resolve@^1.17.1":
+"@types/resolve@1.17.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
   integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
   dependencies:
     "@types/node" "*"
 
+"@types/resolve@^1.17.1":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.19.0.tgz#75c729aedd9a0de60650facb16eb33239d3c407a"
+  integrity sha512-NikKq+D2KJzmaWbcz4JLVT34ybtCC4c3jV6XRGWOQvOkXka9QblEmC+sPf3vRa3lmcURkVbCk2V2BDyCO7jbXg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/responselike@*":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -1823,12 +1810,12 @@
   integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
 
 "@types/serve-static@*":
-  version "1.13.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.5.tgz#3d25d941a18415d3ab092def846e135a08bbcf53"
-  integrity sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
+  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
   dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/mime" "*"
+    "@types/mime" "^1"
+    "@types/node" "*"
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -1836,9 +1823,9 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/speed-measure-webpack-plugin@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#406a4ba9c087ecbad01266a3c9b206c7bb99bc24"
-  integrity sha512-p3gUQy1dqcdg67tjrKPjvBBsaSM3y28Za7DcT3sAyztzshGuZd6uKO+TT40JsfJAkyDrdRF2szk/CNjQhOQ0Bg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#a9054bc32da286cbab2ffaed83bd09608c6ddfad"
+  integrity sha512-6wE+7uZBLSfTdJH041TQCrSoYd7M4ujgnapDNh1lJcHKnoVtE93UtY1FF4slHhTAdW3ADgyr87Gttyil18wIYQ==
   dependencies:
     "@types/webpack" "*"
 
@@ -1865,9 +1852,9 @@
   integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
 
 "@types/uglify-js@*":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.0.tgz#2868d405cc45cd9dc3069179052103032c33afbc"
-  integrity sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz#97ff30e61a0aa6876c270b5f538737e2d6ab8ceb"
+  integrity sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==
   dependencies:
     source-map "^0.6.1"
 
@@ -1882,9 +1869,9 @@
   integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
 
 "@types/webpack-dev-server@^3.1.7":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#bcc3b85e7dc6ac2db25330610513f2228c2fcfb2"
-  integrity sha512-3+86AgSzl18n5P1iUP9/lz3G3GMztCp+wxdDvVuNhx1sr1jE79GpYfKHL8k+Vht3N74K2n98CuAEw4YPJCYtDA==
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz#f8f4dac1da226d530bd15a1d5dc34b23ba766ccb"
+  integrity sha512-rIb+LtUkKnh7+oIJm3WiMJONd71Q0lZuqGLcSqhZ5qjN9gV/CNmZe7Bai+brnBPZ/KVYOsr+4bFLiNZwjBicLw==
   dependencies:
     "@types/connect-history-api-fallback" "*"
     "@types/express" "*"
@@ -1893,9 +1880,9 @@
     "@types/webpack" "*"
 
 "@types/webpack-sources@*", "@types/webpack-sources@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
-  integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
+  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -1911,9 +1898,9 @@
     source-map "^0.6.1"
 
 "@types/webpack@*", "@types/webpack@^4.41.22":
-  version "4.41.22"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.22.tgz#ff9758a17c6bd499e459b91e78539848c32d0731"
-  integrity sha512-JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==
+  version "4.41.26"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef"
+  integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -1944,17 +1931,17 @@
   dependencies:
     lockfile "1.0.4"
 
-"@verdaccio/local-storage@9.7.2":
-  version "9.7.2"
-  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-9.7.2.tgz#af71bc39825b5592d0a761220c94d4e3f0a8b1eb"
-  integrity sha512-Lsn9TR1Jnkl0y7ndQQUi0ypvS9tHT4rqMiMebt2wsiy5mAlLrZ0sjw7erI7wE5sBi/L+uoq0HXfJwLjP8bfrBg==
+"@verdaccio/local-storage@9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-9.7.4.tgz#3ffaa41fc850758296c9f243d765372a2e5e4ea2"
+  integrity sha512-Wj0mJ6FTLGma+nDxpAWJkg7yY0WLh0sUm94juqY9eyWSqOWdv1QvduE9lvl0vh890/QbrlqzxPqxTxeZwsndTA==
   dependencies:
     "@verdaccio/commons-api" "^9.7.1"
     "@verdaccio/file-locking" "^9.7.2"
     "@verdaccio/streams" "^9.7.2"
     async "3.2.0"
     level "5.0.1"
-    lodash "4.17.19"
+    lodash "4.17.20"
     mkdirp "0.5.5"
 
 "@verdaccio/readme@9.7.3":
@@ -1971,10 +1958,10 @@
   resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-9.7.2.tgz#cd5448470d725e221629adb84c74af7dfd8c9678"
   integrity sha512-SoCG1btVFPxOcrs8w9wLJCfe8nfE6EaEXCXyRwGbh+Sr3NLEG0R8JOugGJbuSE+zIRuUs5JaUKjzSec+JKLvZw==
 
-"@verdaccio/ui-theme@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-1.12.1.tgz#5bfc6ed1a222cec0b8d92ac933c3c976dbce2f3e"
-  integrity sha512-J9UEf6MkKugeq5sFhDfqPPGNy4dTSf3fVYK3Q2hGFQiKXvOw7hqovjz6PVOJRNMymBXb2fJuMPIXx1Br3kwD2Q==
+"@verdaccio/ui-theme@1.15.1":
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-1.15.1.tgz#463f12ce3b4950bba1f3f23d5c592b7b235b2652"
+  integrity sha512-CSd/NnVuqWQo7RnmL7ehZeAEYUbvGM33VmWGzoO91Ujny2tbhlg7kdpbfiEIoKl8Yc2wd9bVMd1HJATDF2uHGw==
 
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
@@ -2136,7 +2123,7 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-JSONStream@1.3.5, JSONStream@^1.0.4, JSONStream@^1.3.4:
+JSONStream@1.3.5, JSONStream@^1.0.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
@@ -2220,61 +2207,34 @@ add-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
-adjust-sourcemap-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz#6471143af75ec02334b219f54bc7970c52fb29a4"
-  integrity sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==
+adjust-sourcemap-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
+  integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==
   dependencies:
-    assert "1.4.1"
-    camelcase "5.0.0"
-    loader-utils "1.2.3"
-    object-path "0.11.4"
-    regex-parser "2.2.10"
+    loader-utils "^2.0.0"
+    regex-parser "^2.2.11"
 
 adm-zip@^0.4.9:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
   integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
 
-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.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-
 agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agent-base@~4.2.1:
-  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==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   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"
-
-agentkeepalive@^4.1.0:
+agentkeepalive@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.3.tgz#360a09d743a1f4fde749f9ba07caa6575d08259a"
   integrity sha512-wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg==
@@ -2311,7 +2271,17 @@ ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-alphanum-sort@^1.0.0:
+ajv@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
+  integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+alphanum-sort@^1.0.0, alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
@@ -2333,10 +2303,10 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
   dependencies:
     type-fest "^0.11.0"
 
-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-html-community@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
+  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -2436,11 +2406,6 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-arity-n@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
-  integrity sha1-2edrEXM+CFacCEeuezmyhgswt0U=
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -2508,11 +2473,6 @@ array-unique@^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"
@@ -2550,13 +2510,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@1.4.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"
-
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2607,11 +2560,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
 atob-lite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
@@ -2622,7 +2570,19 @@ atob@^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.8.6, autoprefixer@^9.6.5:
+autoprefixer@10.2.4:
+  version "10.2.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1"
+  integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==
+  dependencies:
+    browserslist "^4.16.1"
+    caniuse-lite "^1.0.30001181"
+    colorette "^1.2.1"
+    fraction.js "^4.0.13"
+    normalize-range "^0.1.2"
+    postcss-value-parser "^4.1.0"
+
+autoprefixer@^9.6.5:
   version "9.8.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
   integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
@@ -2641,9 +2601,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 axobject-query@2.0.2:
   version "2.0.2"
@@ -2652,15 +2612,14 @@ axobject-query@2.0.2:
   dependencies:
     ast-types-flow "0.0.7"
 
-babel-loader@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+babel-loader@8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.3:
@@ -2670,11 +2629,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-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"
@@ -2685,17 +2639,12 @@ base64-arraybuffer@0.1.4:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
   integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
-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, base64-js@^1.1.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-base64id@2.0.0:
+base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
@@ -2731,16 +2680,9 @@ bcryptjs@2.4.3:
   integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
 
 before-after-hook@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
-  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
-
-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"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.1.tgz#99ae36992b5cfab4a83f6bee74ab27835f28f405"
+  integrity sha512-5ekuQOvO04MDj7kYZJaMab2S8SPjGJbotVNyv7QYFCOAwrGZs/YnoDNlh1U+m5hl7H2D/+n0taaAV/tfyd3KMA==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2753,9 +2695,9 @@ binary-extensions@^1.0.0:
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binary-extensions@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
-  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 bindings@^1.5.0:
   version "1.5.0"
@@ -2773,11 +2715,6 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
@@ -2785,7 +2722,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2795,7 +2732,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
-bn.js@^5.1.1:
+bn.js@^5.0.0, bn.js@^5.1.1:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
   integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
@@ -2834,9 +2771,9 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 bootstrap@^4.0.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"
-  integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
+  integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2933,11 +2870,11 @@ browserify-des@^1.0.0:
     safe-buffer "^5.1.2"
 
 browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^4.1.0"
+    bn.js "^5.0.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
@@ -2962,20 +2899,32 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.7.0, browserslist@^4.8.5, browserslist@^4.9.1:
-  version "4.14.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
-  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+browserslist@*, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
+  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
   dependencies:
-    caniuse-lite "^1.0.30001135"
-    electron-to-chromium "^1.3.571"
-    escalade "^3.1.0"
-    node-releases "^1.1.61"
+    caniuse-lite "^1.0.30001181"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.649"
+    escalade "^3.1.1"
+    node-releases "^1.1.70"
+
+browserslist@^4.16.0:
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
+  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
+  dependencies:
+    caniuse-lite "^1.0.30001214"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.719"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 browserstack@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.0.tgz#5a56ab90987605d9c138d7a8b88128370297f9bf"
-  integrity sha512-HJDJ0TSlmkwnt9RZ+v5gFpa1XZTBYTj0ywvLwJ3241J7vMw2jAsGNVhKHtmCOyg+VxeLZyaibO9UL71AsUeDIw==
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
+  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
   dependencies:
     https-proxy-agent "^2.2.1"
 
@@ -3024,12 +2973,12 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
 
 builtin-modules@^1.1.1:
   version "1.1.1"
@@ -3037,9 +2986,9 @@ builtin-modules@^1.1.1:
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 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==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
@@ -3051,10 +3000,10 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
-bunyan@1.8.14:
-  version "1.8.14"
-  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz#3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4"
-  integrity sha512-LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==
+bunyan@1.8.15:
+  version "1.8.15"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46"
+  integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==
   optionalDependencies:
     dtrace-provider "~0.8"
     moment "^2.19.3"
@@ -3071,14 +3020,14 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-c8@~7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/c8/-/c8-7.1.2.tgz#3fd785e8d264175ceffe92c74607f5cfb12f018d"
-  integrity sha512-lCEwL9lbvWOQLxoLw8RF7PM8Cdj+rKxRp/PyWC9S8xASvYHRwXQ2gxzsNTgLhQM1Utc1YDAjzQYPQIxVEyelGg==
+c8@~7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/c8/-/c8-7.5.0.tgz#a69439ab82848f344a74bb25dc5dd4e867764481"
+  integrity sha512-GSkLsbvDr+FIwjNSJ8OwzWAyuznEYGTAd1pzb/Kr0FMLuV4vqYJTyjboDTwmlUNAG6jAU3PFWzqIdKrOt1D8tw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
     "@istanbuljs/schema" "^0.1.2"
-    find-up "^4.0.0"
+    find-up "^5.0.0"
     foreground-child "^2.0.0"
     furi "^2.0.0"
     istanbul-lib-coverage "^3.0.0"
@@ -3086,11 +3035,11 @@ c8@~7.1.0:
     istanbul-reports "^3.0.2"
     rimraf "^3.0.0"
     test-exclude "^6.0.0"
-    v8-to-istanbul "^4.1.2"
-    yargs "^15.0.0"
-    yargs-parser "^18.0.0"
+    v8-to-istanbul "^7.1.0"
+    yargs "^16.0.0"
+    yargs-parser "^20.0.0"
 
-cacache@15.0.5, cacache@^15.0.0, cacache@^15.0.5:
+cacache@15.0.5, cacache@^15.0.5:
   version "15.0.5"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
   integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
@@ -3113,7 +3062,7 @@ cacache@15.0.5, cacache@^15.0.0, cacache@^15.0.5:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^12.0.0, cacache@^12.0.2:
+cacache@^12.0.2:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
   integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
@@ -3170,34 +3119,13 @@ cacheable-request@^7.0.1:
     normalize-url "^4.1.0"
     responselike "^2.0.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-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=
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   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=
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3212,15 +3140,6 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.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"
-    quick-lru "^1.0.0"
-
 camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
@@ -3230,30 +3149,20 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
-
-camelcase@5.3.1, 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==
-
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-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.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.1.0.tgz#27dc176173725fb0adf8a48b647f4d7871944d78"
-  integrity sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==
+camelcase@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -3265,10 +3174,15 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
-  version "1.0.30001148"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz#dc97c7ed918ab33bf8706ddd5e387287e015d637"
-  integrity sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
+  version "1.0.30001181"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001181.tgz#4f0e5184e1ea7c3bf2727e735cbe7ca9a451d673"
+  integrity sha512-m5ul/ARCX50JB8BSNM+oiPmQrR5UmngaQ3QThTTp5HcIIQGP/nPBs82BYLE+tigzm3VW+F4BJIhUyaVtEweelQ==
+
+caniuse-lite@^1.0.30001214:
+  version "1.0.30001218"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001218.tgz#9b44f6ed16f875db6373e2debd4d14a07359002f"
+  integrity sha512-0ASydOWSy3bB88FbDpJSTt+PfDwnMqrym3yRZfqG8EXSQ06OZhF+q5wgYP/EN+jJMERItNcDQUqMyNjzZ+r5+Q==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3291,7 +3205,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.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, 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==
@@ -3313,10 +3227,10 @@ 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", chokidar@^3.0.0, chokidar@^3.2.1, chokidar@^3.4.1, chokidar@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
-  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -3324,9 +3238,9 @@ chardet@^0.7.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.4.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
 chokidar@^2.1.8:
   version "2.1.8"
@@ -3347,7 +3261,7 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4:
+chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -3364,11 +3278,6 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-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"
@@ -3377,15 +3286,15 @@ 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.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
-  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
+circular-dependency-plugin@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600"
+  integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==
 
 clang-format@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.4.0.tgz#1ee2f10637eb5bb0bd7d0b82c949af68e848367e"
-  integrity sha512-NrdyUnHJOGvMa60vbWk7GJTvOdhibj3uK5C0FlwdNG4301OUvqEJTFce9I9x8qw2odBbIVrJ+9xbsFS3a4FbDA==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.5.0.tgz#1bd4c47b66a1a02556b192b93f5505e7ccec84fb"
+  integrity sha512-C1LucFX7E+ABVYcPEbBHM4PYQ2+WInXsqsLpFlQ9cmRfSbk7A7b1I06h/nE4bQ3MsyEkb31jY2gC0Dtc76b4IA==
   dependencies:
     async "^1.5.2"
     glob "^7.0.0"
@@ -3414,14 +3323,14 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-progress@^3.7.0:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.8.2.tgz#abaf1fc6d6401351f16f068117a410554a0eb8c7"
-  integrity sha512-qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.9.0.tgz#25db83447deb812e62d05bac1af9aec5387ef3d4"
+  integrity sha512-g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA==
   dependencies:
     colors "^1.1.2"
     string-width "^4.2.0"
 
-cli-spinners@^2.4.0:
+cli-spinners@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047"
   integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==
@@ -3458,6 +3367,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -3558,7 +3476,7 @@ color-string@^1.5.4:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color@^3.0.0:
+color@^3.0.0, color@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
   integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
@@ -3571,6 +3489,11 @@ colorette@^1.2.1:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -3593,10 +3516,15 @@ commander@^2.11.0, commander@^2.12.1, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
-  integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
+commander@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
+  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
+
+commander@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 common-tags@^1.8.0:
   version "1.8.0"
@@ -3616,38 +3544,11 @@ compare-func@^2.0.0:
     array-ify "^1.0.0"
     dot-prop "^5.1.0"
 
-compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
-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:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-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=
-
-compose-function@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f"
-  integrity sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=
-  dependencies:
-    arity-n "^1.0.4"
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -3725,90 +3626,90 @@ content-type@~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@^5.0.11:
-  version "5.0.11"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz#99a3ca16e4a5305e0c2c2fae3ef74fd7631fc3fb"
-  integrity sha512-nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw==
+conventional-changelog-angular@^5.0.12:
+  version "5.0.12"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9"
+  integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==
   dependencies:
     compare-func "^2.0.0"
     q "^1.5.1"
 
-conventional-changelog-atom@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.7.tgz#221575253a04f77a2fd273eb2bf29a138f710abf"
-  integrity sha512-7dOREZwzB+tCEMjRTDfen0OHwd7vPUdmU0llTy1eloZgtOP4iSLVzYIQqfmdRZEty+3w5Jz+AbhfTJKoKw1JeQ==
+conventional-changelog-atom@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz#a759ec61c22d1c1196925fca88fe3ae89fd7d8de"
+  integrity sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-codemirror@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.7.tgz#d6b6a8ce2707710c5a036e305037547fb9e15bfb"
-  integrity sha512-Oralk1kiagn3Gb5cR5BffenWjVu59t/viE6UMD/mQa1hISMPkMYhJIqX+CMeA1zXgVBO+YHQhhokEj99GP5xcg==
+conventional-changelog-codemirror@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz#398e9530f08ce34ec4640af98eeaf3022eb1f7dc"
+  integrity sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-conventionalcommits@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz#8d96687141c9bbd725a89b95c04966d364194cd4"
-  integrity sha512-ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA==
+conventional-changelog-conventionalcommits@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz#a02e0b06d11d342fdc0f00c91d78265ed0bc0a62"
+  integrity sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw==
   dependencies:
     compare-func "^2.0.0"
     lodash "^4.17.15"
     q "^1.5.1"
 
-conventional-changelog-core@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.0.tgz#d8befd1e1f5126bf35a17668276cc8c244650469"
-  integrity sha512-8+xMvN6JvdDtPbGBqA7oRNyZD4od1h/SIzrWqHcKZjitbVXrFpozEeyn4iI4af1UwdrabQpiZMaV07fPUTGd4w==
+conventional-changelog-core@^4.2.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz#f0897df6d53b5d63dec36b9442bd45354f8b3ce5"
+  integrity sha512-7pDpRUiobQDNkwHyJG7k9f6maPo9tfPzkSWbRq97GGiZqisElhnvUZSvyQH20ogfOjntB5aadvv6NNcKL1sReg==
   dependencies:
     add-stream "^1.0.0"
-    conventional-changelog-writer "^4.0.17"
-    conventional-commits-parser "^3.1.0"
+    conventional-changelog-writer "^4.0.18"
+    conventional-commits-parser "^3.2.0"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "2.0.0"
+    git-raw-commits "^2.0.8"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^4.1.0"
+    git-semver-tags "^4.1.1"
     lodash "^4.17.15"
-    normalize-package-data "^2.3.5"
+    normalize-package-data "^3.0.0"
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
     shelljs "^0.8.3"
-    through2 "^3.0.0"
+    through2 "^4.0.0"
 
-conventional-changelog-ember@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.8.tgz#f0f04eb7ff3c885af97db100865ab95dcfa9917f"
-  integrity sha512-JEMEcUAMg4Q9yxD341OgWlESQ4gLqMWMXIWWUqoQU8yvTJlKnrvcui3wk9JvnZQyONwM2g1MKRZuAjKxr8hAXA==
+conventional-changelog-ember@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz#619b37ec708be9e74a220f4dcf79212ae1c92962"
+  integrity sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.8.tgz#f8b952b7ed7253ea0ac0b30720bb381f4921b46c"
-  integrity sha512-5rTRltgWG7TpU1PqgKHMA/2ivjhrB+E+S7OCTvj0zM/QGg4vmnVH67Vq/EzvSNYtejhWC+OwzvDrLk3tqPry8A==
+conventional-changelog-eslint@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz#689bd0a470e02f7baafe21a495880deea18b7cdb"
+  integrity sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-express@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.5.tgz#6e93705acdad374516ca125990012a48e710f8de"
-  integrity sha512-pW2hsjKG+xNx/Qjof8wYlAX/P61hT5gQ/2rZ2NsTpG+PgV7Rc8RCfITvC/zN9K8fj0QmV6dWmUefCteD9baEAw==
+conventional-changelog-express@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz#420c9d92a347b72a91544750bffa9387665a6ee8"
+  integrity sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-jquery@^3.0.10:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.10.tgz#fe8eb6aff322aa980af5eb68497622a5f6257ce7"
-  integrity sha512-QCW6wF8QgPkq2ruPaxc83jZxoWQxLkt/pNxIDn/oYjMiVgrtqNdd7lWe3vsl0hw5ENHNf/ejXuzDHk6suKsRpg==
+conventional-changelog-jquery@^3.0.11:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz#d142207400f51c9e5bb588596598e24bba8994bf"
+  integrity sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-jshint@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.8.tgz#3fff4df8cb46037f77b9dc3f8e354c7f99332f13"
-  integrity sha512-hB/iI0IiZwnZ+seYI+qEQ4b+EMQSEC8jGIvhO2Vpz1E5p8FgLz75OX8oB1xJWl+s4xBMB6f8zJr0tC/BL7YOjw==
+conventional-changelog-jshint@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz#f2d7f23e6acd4927a238555d92c09b50fe3852ff"
+  integrity sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==
   dependencies:
     compare-func "^2.0.0"
     q "^1.5.1"
@@ -3818,87 +3719,82 @@ conventional-changelog-preset-loader@^2.3.4:
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c"
   integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==
 
-conventional-changelog-writer@^4.0.17:
-  version "4.0.17"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz#4753aaa138bf5aa59c0b274cb5937efcd2722e21"
-  integrity sha512-IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw==
+conventional-changelog-writer@^4.0.18:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz#1ca7880b75aa28695ad33312a1f2366f4b12659f"
+  integrity sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==
   dependencies:
     compare-func "^2.0.0"
-    conventional-commits-filter "^2.0.6"
+    conventional-commits-filter "^2.0.7"
     dateformat "^3.0.0"
     handlebars "^4.7.6"
     json-stringify-safe "^5.0.1"
     lodash "^4.17.15"
-    meow "^7.0.0"
+    meow "^8.0.0"
     semver "^6.0.0"
     split "^1.0.0"
-    through2 "^3.0.0"
+    through2 "^4.0.0"
 
 conventional-changelog@^3.0.0:
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.23.tgz#d696408021b579a3814aba79b38729ed86478aea"
-  integrity sha512-sScUu2NHusjRC1dPc5p8/b3kT78OYr95/Bx7Vl8CPB8tF2mG1xei5iylDTRjONV5hTlzt+Cn/tBWrKdd299b7A==
-  dependencies:
-    conventional-changelog-angular "^5.0.11"
-    conventional-changelog-atom "^2.0.7"
-    conventional-changelog-codemirror "^2.0.7"
-    conventional-changelog-conventionalcommits "^4.4.0"
-    conventional-changelog-core "^4.2.0"
-    conventional-changelog-ember "^2.0.8"
-    conventional-changelog-eslint "^3.0.8"
-    conventional-changelog-express "^2.0.5"
-    conventional-changelog-jquery "^3.0.10"
-    conventional-changelog-jshint "^2.0.8"
+  version "3.1.24"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.24.tgz#ebd180b0fd1b2e1f0095c4b04fd088698348a464"
+  integrity sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==
+  dependencies:
+    conventional-changelog-angular "^5.0.12"
+    conventional-changelog-atom "^2.0.8"
+    conventional-changelog-codemirror "^2.0.8"
+    conventional-changelog-conventionalcommits "^4.5.0"
+    conventional-changelog-core "^4.2.1"
+    conventional-changelog-ember "^2.0.9"
+    conventional-changelog-eslint "^3.0.9"
+    conventional-changelog-express "^2.0.6"
+    conventional-changelog-jquery "^3.0.11"
+    conventional-changelog-jshint "^2.0.9"
     conventional-changelog-preset-loader "^2.3.4"
 
-conventional-commits-filter@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz#0935e1240c5ca7698329affee1b6a46d33324c4c"
-  integrity sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==
+conventional-commits-filter@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3"
+  integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==
   dependencies:
     lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.0, conventional-commits-parser@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz#10140673d5e7ef5572633791456c5d03b69e8be4"
-  integrity sha512-RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==
+conventional-commits-parser@^3.0.0, conventional-commits-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca"
+  integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.1"
     lodash "^4.17.15"
-    meow "^7.0.0"
+    meow "^8.0.0"
     split2 "^2.0.0"
-    through2 "^3.0.0"
+    through2 "^4.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@1.7.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
-convert-source-map@^0.3.3:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
-  integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
-
 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=
-
 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==
 
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
 cookies@0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
@@ -3907,6 +3803,13 @@ cookies@0.8.0:
     depd "~2.0.0"
     keygrip "~1.1.0"
 
+copy-anything@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.1.tgz#2afbce6da684bdfcbec93752fa762819cb480d9a"
+  integrity sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==
+  dependencies:
+    is-what "^3.7.1"
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -3924,10 +3827,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@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5"
-  integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q==
+copy-webpack-plugin@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb"
+  integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==
   dependencies:
     cacache "^15.0.5"
     fast-glob "^3.2.4"
@@ -3941,25 +3844,25 @@ copy-webpack-plugin@6.2.1:
     serialize-javascript "^5.0.1"
     webpack-sources "^1.4.3"
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+core-js-compat@^3.8.0:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f"
+  integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.16.1"
     semver "7.0.0"
 
-core-js@3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+core-js@3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
+  integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
 
 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=
 
-cors@2.8.5:
+cors@2.8.5, 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==
@@ -3967,16 +3870,6 @@ cors@2.8.5:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^5.0.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"
-
 cosmiconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
@@ -4019,6 +3912,18 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+critters@0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.12.tgz#32baa87526e053a41b67e19921673ed92264e2ab"
+  integrity sha512-ujxKtKc/mWpjrOKeaACTaQ1aP0O31M0ZPWhfl85jZF1smPU4Ivb9va5Ox2poif4zVJQQo0LCFlzGtEZAsCAPcw==
+  dependencies:
+    chalk "^4.1.0"
+    css-select "^4.1.3"
+    parse5 "^6.0.1"
+    parse5-htmlparser2-tree-adapter "^6.0.1"
+    postcss "^8.3.7"
+    pretty-bytes "^5.3.0"
+
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -4061,6 +3966,18 @@ css-color-names@0.0.4, css-color-names@^0.0.4:
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
   integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
+css-color-names@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67"
+  integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==
+
+css-declaration-sorter@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.0.0.tgz#eb21f75860078627e9e3cc6f5535ccfcea445817"
+  integrity sha512-S0TE4E0ha5+tBHdLWPc5n+S8E4dFBS5xScPvgHkLNZwWvX4ISoFGhGeerLC9uS1cKA/sC+K2wHq6qEbcagT/fg==
+  dependencies:
+    timsort "^0.3.0"
+
 css-declaration-sorter@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
@@ -4069,16 +3986,16 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.0.tgz#f0a48dfacc3ab9936a05ee16a09e7f313872e117"
-  integrity sha512-9g35eXRBgjvswyJWoqq/seWp+BOxvUl8IinVNTsUBFFxtwfEYvlmEn6ciyn0liXGbGh5HyJjPGCuobDSfqMIVg==
+css-loader@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f"
+  integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==
   dependencies:
-    camelcase "^6.1.0"
+    camelcase "^6.2.0"
     cssesc "^3.0.0"
     icss-utils "^5.0.0"
     loader-utils "^2.0.0"
-    postcss "^8.1.1"
+    postcss "^8.1.4"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
@@ -4109,6 +4026,28 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
+css-select@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz#d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"
+  integrity sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^4.0.0"
+    domhandler "^4.0.0"
+    domutils "^2.4.3"
+    nth-check "^2.0.0"
+
+css-select@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^5.0.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
+    nth-check "^2.0.0"
+
 css-selector-tokenizer@^0.7.1:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
@@ -4125,12 +4064,12 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-tree@1.0.0-alpha.39:
-  version "1.0.0-alpha.39"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
-  integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==
+css-tree@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
   dependencies:
-    mdn-data "2.0.6"
+    mdn-data "2.0.14"
     source-map "^0.6.1"
 
 css-what@^3.2.1:
@@ -4138,6 +4077,16 @@ css-what@^3.2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
+css-what@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233"
+  integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==
+
+css-what@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
+  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
+
 css@^2.0.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
@@ -4196,6 +4145,41 @@ cssnano-preset-default@^4.0.7:
     postcss-svgo "^4.0.2"
     postcss-unique-selectors "^4.0.1"
 
+cssnano-preset-default@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.0.1.tgz#76adc00f7aae36ae80552b8356e21bec4b233ca2"
+  integrity sha512-cfmfThYODGqhpQKDq9H0MTAqkMvZ3dGbOUTBKw0xWZiIycMqHid22LsJXJl4r1qX4qzDeKxcSyQ/Xb5Mu3Z//Q==
+  dependencies:
+    css-declaration-sorter "6.0.0"
+    cssnano-utils "^2.0.0"
+    postcss-calc "^8.0.0"
+    postcss-colormin "^5.0.0"
+    postcss-convert-values "^5.0.0"
+    postcss-discard-comments "^5.0.0"
+    postcss-discard-duplicates "^5.0.0"
+    postcss-discard-empty "^5.0.0"
+    postcss-discard-overridden "^5.0.0"
+    postcss-merge-longhand "^5.0.1"
+    postcss-merge-rules "^5.0.0"
+    postcss-minify-font-values "^5.0.0"
+    postcss-minify-gradients "^5.0.0"
+    postcss-minify-params "^5.0.0"
+    postcss-minify-selectors "^5.0.0"
+    postcss-normalize-charset "^5.0.0"
+    postcss-normalize-display-values "^5.0.0"
+    postcss-normalize-positions "^5.0.0"
+    postcss-normalize-repeat-style "^5.0.0"
+    postcss-normalize-string "^5.0.0"
+    postcss-normalize-timing-functions "^5.0.0"
+    postcss-normalize-unicode "^5.0.0"
+    postcss-normalize-url "^5.0.0"
+    postcss-normalize-whitespace "^5.0.0"
+    postcss-ordered-values "^5.0.0"
+    postcss-reduce-initial "^5.0.0"
+    postcss-reduce-transforms "^5.0.0"
+    postcss-svgo "^5.0.0"
+    postcss-unique-selectors "^5.0.0"
+
 cssnano-util-get-arguments@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
@@ -4218,22 +4202,26 @@ cssnano-util-same-parent@^4.0.0:
   resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
   integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
-cssnano@4.1.10:
-  version "4.1.10"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
-  integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==
+cssnano-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.0.tgz#b04baaa312aa3dd5a854b7f61d76b9d94be07f74"
+  integrity sha512-xvxmTszdrvSyTACdPe8VU5J6p4sm3egpgw54dILvNqt5eBUv6TFjACLhSxtRuEsxYrgy8uDy269YjScO5aKbGA==
+
+cssnano@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.2.tgz#3f6de4fd5ecb7b5fb636c1a606de5f38cd241493"
+  integrity sha512-8JK3EnPsjQsULme9/e5M2hF564f/480hwsdcHvQ7ZtAIMfQ1O3SCfs+b8Mjf5KJxhYApyRshR2QSovEJi2K72Q==
   dependencies:
-    cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.7"
-    is-resolvable "^1.0.0"
-    postcss "^7.0.0"
+    cosmiconfig "^7.0.0"
+    cssnano-preset-default "^5.0.1"
+    is-resolvable "^1.1.0"
 
-csso@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
-  integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==
+csso@^4.0.2, csso@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
-    css-tree "1.0.0-alpha.39"
+    css-tree "^1.1.2"
 
 cssom@^0.4.1:
   version "0.4.4"
@@ -4274,26 +4262,11 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
 damerau-levenshtein@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
   integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==
 
-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"
-
 dargs@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
@@ -4330,10 +4303,10 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-dayjs@1.8.28:
-  version "1.8.28"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.28.tgz#37aa6201df483d089645cb6c8f6cef6f0c4dbc07"
-  integrity sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg==
+dayjs@1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.3.tgz#cf3357c8e7f508432826371672ebf376cb7d619b"
+  integrity sha512-/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
@@ -4342,40 +4315,33 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   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@4, debug@4.2.0, debug@^4.1.0, debug@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@~4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   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==
+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.1.1"
+    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, decamelize-keys@^1.1.0:
+decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
   integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
@@ -4553,10 +4519,10 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-devtools-protocol@0.0.799653:
-  version "0.0.799653"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.799653.tgz#86fc95ce5bf4fdf4b77a58047ba9d2301078f119"
-  integrity sha512-t1CcaZbvm8pOlikqrsIM9GOa7Ipp07+4h/q9u0JXBWjPCjHdBl9KkddX87Vv9vBHoBGtwV79sYQNGnQM6iS5gg==
+devtools-protocol@0.0.842839:
+  version "0.0.842839"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.842839.tgz#dfdb49a74fabe80256b91e878e561a1ad2a24352"
+  integrity sha512-iI3v9uuGUW02vPUXTvxl4ijnCPL/RGRVR9I+U8s7+9OG9An/bvExjQ0KrXE9V0QBLra7wANhZctB00FKBSn1gw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
@@ -4635,6 +4601,15 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
+dom-serializer@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be"
+  integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    entities "^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"
@@ -4646,9 +4621,14 @@ domelementtype@1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
-  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+
+domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -4657,6 +4637,13 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+  dependencies:
+    domelementtype "^2.2.0"
+
 domino@^2.1.2:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe"
@@ -4675,6 +4662,24 @@ domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^2.4.3:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
+  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
+domutils@^2.6.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-prop@^5.1.0, dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -4731,10 +4736,15 @@ 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.571:
-  version "1.3.578"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz#e6671936f4571a874eb26e2e833aa0b2c0b776e0"
-  integrity sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==
+electron-to-chromium@^1.3.649:
+  version "1.3.649"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.649.tgz#3aa8be052d4d268ede45d8e98d0cd60ffefad607"
+  integrity sha512-ojGDupQ3UMkvPWcTICe4JYe17+o9OLiFMPoduoR72Zp2ILt1mRVeqnxBEd6s/ptekrnsFU+0A4lStfBe/wyG/A==
+
+electron-to-chromium@^1.3.719:
+  version "1.3.722"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.722.tgz#621657f79e7f65402e71aa3403bc941f3a4af0a0"
+  integrity sha512-aAsc906l0RBsVTsGTK+KirVfey9eNtxyejdkbNzkISGxb7AFna3Kf0qvsp8tMttzBt9Bz3HddtYQ+++/PZtRYA==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -4759,11 +4769,6 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-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=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -4798,58 +4803,38 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.4.0:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
-  integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==
-  dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~6.1.0"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
+engine.io-parser@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e"
+  integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==
   dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
 
-engine.io@~3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"
-  integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==
+engine.io@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.0.tgz#d8ac90a09ed9fc703abf87023f1e1815e33f044e"
+  integrity sha512-vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "0.3.1"
-    debug "~4.1.0"
-    engine.io-parser "~2.2.0"
-    ws "^7.1.2"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~4.0.0"
+    ws "~7.4.2"
 
-enhanced-resolve@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.2.0.tgz#3db3307a608f236f33aeea79303d32915792cbab"
-  integrity sha512-NZlGLl8DxmZoq0uqPPtJfsCAir68uR047+Udsh1FH4+5ydGQdMurn/A430A1BtxASVmMEuS7/XiJ5OxJ9apAzQ==
+enhanced-resolve@5.7.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c"
+  integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==
   dependencies:
     graceful-fs "^4.2.4"
-    tapable "^2.0.0"
+    tapable "^2.2.0"
 
 enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -4861,14 +4846,19 @@ ent@~2.2.0:
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 entities@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
-  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-envinfo@7.5.1:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.1.tgz#93c26897225a00457c75e734d354ea9106a72236"
-  integrity sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==
+env-paths@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
+envinfo@7.7.3:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
+  integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -4876,9 +4866,9 @@ err-code@^1.0.0:
   integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.1, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
@@ -4889,7 +4879,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+es-abstract@^1.17.2:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -4906,23 +4896,25 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2"
+  integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
     has "^1.0.3"
     has-symbols "^1.0.1"
     is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
+    is-negative-zero "^2.0.1"
     is-regex "^1.1.1"
-    object-inspect "^1.8.0"
+    object-inspect "^1.9.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.3"
+    string.prototype.trimstart "^1.0.3"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4933,24 +4925,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.50:
-  version "0.10.53"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
-
-es6-iterator@2.0.3, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -4963,18 +4937,10 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
-escalade@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
-  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5051,9 +5017,9 @@ estree-walker@^1.0.1:
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
 estree-walker@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
-  integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -5157,13 +5123,6 @@ express@4.17.1, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-ext@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
-  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
-  dependencies:
-    type "^2.0.0"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5243,22 +5202,10 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
 fast-glob@^3.1.1, fast-glob@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
-  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5283,20 +5230,13 @@ fastparse@^1.1.2:
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e"
+  integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==
   dependencies:
     reusify "^1.0.4"
 
-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:
+faye-websocket@^0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
   integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
@@ -5310,7 +5250,7 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
@@ -5322,10 +5262,10 @@ figures@^3.0.0, figures@^3.2.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa"
-  integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw==
+file-loader@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
   dependencies:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
@@ -5418,12 +5358,13 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-versions@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
-  integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
-    semver-regex "^2.0.0"
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
 
 flatted@^2.0.0, flatted@^2.0.1:
   version "2.0.2"
@@ -5439,9 +5380,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
+  integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -5503,6 +5444,11 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
+fraction.js@^4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe"
+  integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -5555,23 +5501,6 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^1.0.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -5602,10 +5531,10 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -5634,26 +5563,30 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.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==
-
 gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 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-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   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-intrinsic@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.0.tgz#892e62931e6938c8a23ea5aaebcfb67bd97da97e"
+  integrity sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 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"
@@ -5670,7 +5603,7 @@ 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@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -5703,27 +5636,16 @@ gh-got@^9.0.0:
   dependencies:
     got "^10.5.7"
 
-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"
-    meow "^4.0.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-
-git-raw-commits@^2.0.0:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.7.tgz#02e9357727a9755efa8e14dd5e59b381c29068fb"
-  integrity sha512-SkwrTqrDxw8y0G1uGJ9Zw13F7qu3LF8V4BifyDeiJCxSnjRGZD9SaoMiMqUvvXMXh6S3sOQ1DsBN7L2fMUZW/g==
+git-raw-commits@^2.0.0, git-raw-commits@^2.0.8:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.10.tgz#e2255ed9563b1c9c3ea6bd05806410290297bbc1"
+  integrity sha512-sHhX5lsbG9SOO6yXdlwgEMQ/ljIn7qMpAbJZCGfXX2fq5T8M5SrDnpYk9/4HswTildcIqatsWa91vty6VhWSaQ==
   dependencies:
     dargs "^7.0.0"
-    lodash.template "^4.0.2"
-    meow "^7.0.0"
-    split2 "^2.0.0"
-    through2 "^3.0.0"
+    lodash "^4.17.15"
+    meow "^8.0.0"
+    split2 "^3.0.0"
+    through2 "^4.0.0"
 
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
@@ -5733,12 +5655,12 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.0.tgz#0146c9bc24ee96104c99f443071c8c2d7dc848e3"
-  integrity sha512-TcxAGeo03HdErzKzi4fDD+xEL7gi8r2Y5YSxH6N2XYdVSV5UkBwfrt7Gqo1b+uSHCjy/sa9Y6BBBxxFLxfbhTg==
+git-semver-tags@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780"
+  integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==
   dependencies:
-    meow "^7.0.0"
+    meow "^8.0.0"
     semver "^6.0.0"
 
 gitconfiglocal@^1.0.0:
@@ -5763,11 +5685,6 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -5780,7 +5697,7 @@ glob@7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5809,9 +5726,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
+  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -5864,7 +5781,7 @@ got@^10.5.7:
     to-readable-stream "^2.0.0"
     type-fest "^0.10.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -5911,18 +5828,6 @@ has-ansi@^2.0.0:
   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@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -6017,17 +5922,10 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hosted-git-info@^3.0.2:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03"
-  integrity sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 hosted-git-info@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.6.tgz#761da6d68c559238164f3f3078842ef9e8ae1607"
-  integrity sha512-VRvqVD5T6t9HdmNDWTwbi8H/EC722MemAhOSP5QvYAXpDAY0Nhu2I/i+bXsktu4sU5LVHSh/wmXtVU8bDtjedQ==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
+  integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -6063,22 +5961,17 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-entities@^1.2.1, html-entities@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
-  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
+html-entities@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
 
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-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, http-cache-semantics@^4.0.4:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
@@ -6132,17 +6025,9 @@ http-errors@~1.7.2:
     toidentifier "1.0.0"
 
 http-parser-js@>=0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
-  integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
-
-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"
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
 http-proxy-agent@^4.0.1:
   version "4.0.1"
@@ -6191,23 +6076,7 @@ https-browserify@^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, https-proxy-agent@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
-  dependencies:
-    agent-base "5"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
+https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
   integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
@@ -6215,6 +6084,14 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  dependencies:
+    agent-base "^4.3.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"
@@ -6222,23 +6099,12 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^4.0.10:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
-  integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
-    find-versions "^3.2.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^4.2.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
+husky@5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-5.0.8.tgz#2fd4cb4972bfb3fdb999feb48587aee8925339da"
+  integrity sha512-lijwzgHIJi7iYijEw77DIqyPDR6mFsOuGbjonI83nnAqJbWShGKtAJg1IqnFabnqGPEMiPv0Q8bnSwThfjW95A==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24, 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==
@@ -6253,21 +6119,21 @@ iconv-lite@^0.6.2:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 icss-utils@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.0.0.tgz#03ed56c3accd32f9caaf1752ebf64ef12347bb84"
-  integrity sha512-aF2Cf/CkEZrI/vsu5WI/I+akFgdbwQHVE9YRZxATrhH4PVIe6a3BIjwjEcW+z+jP/hNh+YvM3lAAn1wJQ6opSg==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+ieee754@^1.1.13, ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 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, ignore-walk@^3.0.3:
+ignore-walk@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
   integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
@@ -6304,18 +6170,10 @@ immutable@^3.8.2:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
   integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
-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-fresh@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -6340,11 +6198,6 @@ indent-string@^2.1.0:
   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=
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -6355,11 +6208,6 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -6388,22 +6236,27 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.5, ini@^1.3.2, ini@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+ini@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-injection-js@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.3.1.tgz#c6b7594ab0bd5da73eb8ea246fe19d98d74508cc"
-  integrity sha512-t+kpDAOL/DUZ68JncAhsb8C91qhJ6dXRMcOuvJfNA7sp63etdiQe6KQoxE/nZ5b2eTi0TQX6OothOCm89cLAJQ==
+ini@^1.3.2, ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+injection-js@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.4.0.tgz#ebe8871b1a349f23294eaa751bbd8209a636e754"
+  integrity sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==
   dependencies:
-    tslib "^1.9.3"
+    tslib "^2.0.0"
 
 inquirer-autocomplete-prompt@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.2.0.tgz#da13d80cb0758ff5d58703e17afc533b5b61cc6d"
-  integrity sha512-t8A0gFq0mOKGz8wmGBPh+M/AC8KSMMcn7dnHXzLWyKvLiRYWswQ6rg7d938hoR5tVP1GpHVmHOR6YP8G5dYhhQ==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.3.0.tgz#fcbba926be2d3cf338e3dd24380ae7c408113b46"
+  integrity sha512-zvAc+A6SZdcN+earG5SsBu1RnQdtBS4o8wZ/OqJiCfL34cfOx+twVRq7wumYix6Rkdjn1N2nVCcO3wHqKqgdGg==
   dependencies:
     ansi-escapes "^4.3.1"
     chalk "^4.0.0"
@@ -6443,13 +6296,6 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-invariant@^2.2.2, invariant@^2.2.4:
-  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@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -6460,7 +6306,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.5, ip@^1.1.0, 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=
@@ -6495,9 +6341,11 @@ is-accessor-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -6529,11 +6377,11 @@ is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
 
-is-color-stop@^1.0.0:
+is-color-stop@^1.0.0, is-color-stop@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
   integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
@@ -6545,6 +6393,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 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"
@@ -6582,11 +6437,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     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-docker@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
@@ -6660,10 +6510,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-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -6720,7 +6570,7 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-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=
@@ -6751,7 +6601,7 @@ is-regex@^1.0.4, is-regex@^1.1.1:
   dependencies:
     has-symbols "^1.0.1"
 
-is-resolvable@^1.0.0:
+is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
@@ -6797,6 +6647,11 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
+is-what@^3.7.1:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55"
+  integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -6819,11 +6674,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~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=
-
 isarray@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
@@ -6940,11 +6790,11 @@ jasmine@2.8.0:
     jasmine-core "~2.8.0"
 
 jasmine@^3.3.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.1.tgz#a20456b309a669b547a3c24bb2120f16f70cfc65"
-  integrity sha512-Jqp8P6ZWkTVFGmJwBK46p+kJNrZCdqkQ4GL+PGuBXZwK1fM4ST9BizkYgIwCFqYYqnTizAy6+XG2Ej5dFrej9Q==
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.4.tgz#1f8e4a0d5028a2dc66942b73b9fef4c32be97ad5"
+  integrity sha512-hIeOou6y0BgCOKYgXYveQvlY+PTHgDPajFf+vLCYbMTQ+VjAP9+EQv0nuC9+gyCAAWISRFauB1XUb9kFuOKtcQ==
   dependencies:
-    fast-glob "^2.2.6"
+    glob "^7.1.6"
     jasmine-core "~3.6.0"
 
 jasminewd2@^2.1.0:
@@ -6952,10 +6802,10 @@ jasminewd2@^2.1.0:
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
-jest-worker@26.5.0, jest-worker@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
-  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
+jest-worker@26.6.2, jest-worker@^26.5.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
@@ -6971,15 +6821,15 @@ js-base64@^2.4.3:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^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-yaml@3.14.0, js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+js-yaml@3.14.1, js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -7036,7 +6886,7 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-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.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==
@@ -7051,6 +6901,11 @@ json-schema-traverse@^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-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -7061,7 +6916,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~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:
+json3@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
@@ -7074,16 +6929,16 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 json5@^2.1.0, json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
-jsonc-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
-  integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
+jsonc-parser@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
+  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -7092,15 +6947,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonfile@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
-  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
-  dependencies:
-    universalify "^1.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonparse@^1.2.0, jsonparse@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -7197,10 +7043,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@~5.2.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4"
-  integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==
+karma@~6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.0.tgz#8d9f61252a3f8e935f8456c8df3fa796ca132339"
+  integrity sha512-QmRZ6HdKe6mHd89Az6yb85URRyDbXmn2IBo3lic7cwkkLjDWpjrMJxPAKlwNa5dFM1iHdT+kjtNJM0J5YAH90A==
   dependencies:
     body-parser "^1.19.0"
     braces "^3.0.2"
@@ -7220,11 +7066,11 @@ karma@~5.2.0:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^2.3.0"
+    socket.io "^3.1.0"
     source-map "^0.6.1"
     tmp "0.2.1"
-    ua-parser-js "0.7.22"
-    yargs "^15.3.1"
+    ua-parser-js "^0.7.23"
+    yargs "^16.1.1"
 
 keygrip@~1.1.0:
   version "1.1.0"
@@ -7269,10 +7115,10 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-kleur@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.0.2.tgz#57b36cc5235601f824c33e6e45db10cd5493dbf5"
-  integrity sha512-FGCCxczbrZuF5CtMeO0xfnjhzkVZSXfcWK90IPLucDWZwskrpYN7pmRIgvd8muU0mrPrzy4A2RBGuwCjLHI+nw==
+kleur@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.3.tgz#8d262a56d79a137ee1b706e967c0b08a7fef4f4c"
+  integrity sha512-H1tr8QP2PxFTNwAFM74Mui2b6ovcY9FoxJefgrwxY+OCJcq01k5nvhf4M/KnizzrJvLRap5STUy7dgDV35iUBw==
 
 klona@^2.0.4:
   version "2.0.4"
@@ -7286,20 +7132,22 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-less-loader@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4"
-  integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w==
+less-loader@7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5"
+  integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==
   dependencies:
     klona "^2.0.4"
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-less@3.12.2, less@^3.10.3:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4"
-  integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==
+less@4.1.1, less@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba"
+  integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==
   dependencies:
+    copy-anything "^2.0.1"
+    parse-node-version "^1.0.1"
     tslib "^1.10.0"
   optionalDependencies:
     errno "^0.1.1"
@@ -7307,7 +7155,7 @@ less@3.12.2, less@^3.10.3:
     image-size "~0.5.0"
     make-dir "^2.1.0"
     mime "^1.4.1"
-    native-request "^1.0.5"
+    needle "^2.5.2"
     source-map "~0.6.0"
 
 level-codec@^9.0.0:
@@ -7394,18 +7242,6 @@ levelup@^4.3.2:
     level-supports "~1.0.0"
     xtend "~4.0.0"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -7414,17 +7250,18 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-checker-webpack-plugin@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/license-checker-webpack-plugin/-/license-checker-webpack-plugin-0.1.5.tgz#5f09b91098b53f986c74f02d81258aa691b2956e"
-  integrity sha512-UkQiBPva59iJqWJ1eF0CuOpvIHUehOyojjVkI2Q1a9Bv4tR1g0BpBRamqjKoCPDNoE53Y5f1znhQ6k81LGEBwQ==
+license-checker-webpack-plugin@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/license-checker-webpack-plugin/-/license-checker-webpack-plugin-0.2.1.tgz#985892b40be2a85198194038b63f3f000a30afd0"
+  integrity sha512-rX8B+mH6fk1vxbnIu/UztqTEonQw95xwOkoRjX3TSrRZA/pbG9CWa3wnSo89KY/ej379JQoq050fsuthy6AU+A==
   dependencies:
-    "@hapi/joi" "^16.1.7"
+    glob "^7.1.6"
     lodash.template "^4.5.0"
     minimatch "^3.0.4"
     semver "^6.3.0"
     spdx-expression-validate "^2.0.0"
     spdx-satisfies "^5.0.0"
+    superstruct "^0.10.12"
     webpack-sources "^1.4.3"
     wrap-ansi "^6.1.0"
 
@@ -7444,10 +7281,10 @@ license-checker@^25.0.0:
     spdx-satisfies "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.0.tgz#c00f70d5725ba0408de208acb9e66612cc2eceda"
-  integrity sha512-JK/DXrtN6UeYQSgkg5q1+pgJ8aiKPL9tnz9Wzw+Ikkf+8mJxG56x6t8O+OH/tAeF/5NREnelTEMyFtbJNkjH4w==
+license-webpack-plugin@2.3.11:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8"
+  integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -7459,14 +7296,6 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-line-column@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
-  dependencies:
-    isarray "^1.0.0"
-    isobject "^2.0.0"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -7498,15 +7327,6 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-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"
-    json5 "^1.0.1"
-
 loader-utils@2.0.0, loader-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
@@ -7548,6 +7368,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lockfile@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
@@ -7620,7 +7447,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.template@^4.0.2, lodash.template@^4.5.0:
+lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -7640,12 +7467,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.19:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
+lodash@4.17.20, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -7679,23 +7501,16 @@ log4js@^6.2.1:
     rfdc "^1.1.4"
     streamroller "^2.2.4"
 
-loglevel@^1.6.6, loglevel@^1.6.8:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+loglevel@^1.6.8:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
 long@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-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"
@@ -7767,7 +7582,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -7779,40 +7594,23 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
-  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
-  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.3"
-    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"
-
 make-fetch-happen@^8.0.9:
-  version "8.0.10"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.10.tgz#f37c5d93d14290488ca6a2ae917a380bd7d24f16"
-  integrity sha512-jPLPKQjBmDLK5r1BdyDyNKBytmkv2AsDWm2CxHJh+fqhSmC9Pmb7RQxwOq8xQig9+AWIS49+51k4f6vDQ3VnrQ==
+  version "8.0.13"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.13.tgz#3692e1fdf027343c782e53bfe1f941fe85db9462"
+  integrity sha512-rQ5NijwwdU8tIaBrpTtSVrNCcAJfyDRcKBC76vOQlyJX588/88+TE+UpjWl4BgG7gCkp29wER7xcRqkeg+x64Q==
   dependencies:
-    agentkeepalive "^4.1.0"
-    cacache "^15.0.0"
-    http-cache-semantics "^4.0.4"
+    agentkeepalive "^4.1.3"
+    cacache "^15.0.5"
+    http-cache-semantics "^4.1.0"
     http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
     lru-cache "^6.0.0"
     minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.0"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
+    minipass-pipeline "^1.2.4"
     promise-retry "^1.1.1"
     socks-proxy-agent "^5.0.0"
     ssri "^8.0.0"
@@ -7834,11 +7632,6 @@ map-obj@^1.0.0, map-obj@^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-obj@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
@@ -7856,6 +7649,11 @@ marked@1.1.1:
   resolved "https://registry.yarnpkg.com/marked/-/marked-1.1.1.tgz#e5d61b69842210d5df57b05856e0c91572703e6a"
   integrity sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==
 
+marked@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb"
+  integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -7865,16 +7663,16 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+mdn-data@2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
+
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdn-data@2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
-  integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -7921,37 +7719,22 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.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"
-    loud-rejection "^1.0.0"
-    minimist "^1.1.3"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-
-meow@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.1.tgz#7c01595e3d337fcb0ec4e8eed1666ea95903d306"
-  integrity sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==
+meow@^8.0.0:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
+  integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==
   dependencies:
     "@types/minimist" "^1.2.0"
     camelcase-keys "^6.2.2"
     decamelize-keys "^1.1.0"
     hard-rejection "^2.1.0"
     minimist-options "4.1.0"
-    normalize-package-data "^2.5.0"
+    normalize-package-data "^3.0.0"
     read-pkg-up "^7.0.1"
     redent "^3.0.0"
     trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -7977,7 +7760,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -8022,32 +7805,27 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-"mime-db@>= 1.43.0 < 2":
+mime-db@1.45.0, "mime-db@>= 1.43.0 < 2":
   version "1.45.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
   integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.45.0"
 
 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==
 
-mime@2.4.6, mime@^2.3.1, mime@^2.4.4, mime@^2.4.5:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+mime@2.5.0, mime@^2.3.1, mime@^2.4.4, mime@^2.4.5:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1"
+  integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==
 
 mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
@@ -8069,13 +7847,12 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.0.0.tgz#4afb39f3d97b1b92eacb1ac45025416089f831bd"
-  integrity sha512-IsmrPv1nkdSUtFCDrAsuv5kg0k/27sLxfXqSz8vLjnbRKrNgoRdQrUNA4MppawvD+GHLkNP6L1P93Bw50ALkbg==
+mini-css-extract-plugin@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3"
+  integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==
   dependencies:
     loader-utils "^2.0.0"
-    normalize-url "1.9.1"
     schema-utils "^3.0.0"
     webpack-sources "^1.1.0"
 
@@ -8105,18 +7882,10 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-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"
-
-minimist@1.2.5, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@1.2.6, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -8125,10 +7894,10 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.2.1, minipass-fetch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.2.tgz#573766fb1ae86e30df916a6b060bc2e801bf8f37"
-  integrity sha512-/i4fX1ss+Dtwyk++OsAI6SEV+eE1dvI6W+0hORdjfruQ7VD5uYTetJIHcEMjWiEiszWjn2aAtP1CB/Q4KfeoYA==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a"
+  integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==
   dependencies:
     minipass "^3.1.0"
     minipass-sized "^1.0.3"
@@ -8151,7 +7920,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8165,28 +7934,13 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
   integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -8224,7 +7978,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1, mkdirp@~0.5.x:
+mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -8268,11 +8022,16 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 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"
@@ -8312,14 +8071,24 @@ mv@2.1.1, mv@~2:
     rimraf "~2.4.0"
 
 nan@^2.12.1, nan@^2.14.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
-  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nanoid@^3.1.12:
-  version "3.1.12"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
-  integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
+nanoid@^3.1.20:
+  version "3.1.20"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
+  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+
+nanoid@^3.1.23:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+
+nanoid@^3.1.30:
+  version "3.1.30"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
+  integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -8343,16 +8112,20 @@ napi-macros@~2.0.0:
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
   integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==
 
-native-request@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.7.tgz#ff742dc555b4c8f2f1c14b548639ba174e573856"
-  integrity sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==
-
 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.5.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
+  integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -8363,56 +8136,42 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-
-ng-packagr@~11.0.0-next.0:
-  version "11.0.0-next.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-11.0.0-next.0.tgz#33929360703012b6a6817dba592772cb7fa37aa2"
-  integrity sha512-Fnwbw8L2VrBdyaUq6KTdYjJzccjAWkT6xj3zO37SRRPNDxdO26jusyp/7fZt5hhHys+5PjCGM1iFTEPWzPzmsg==
+ng-packagr@~11.1.0:
+  version "11.1.2"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-11.1.2.tgz#d9e9439911d57603d80c4ea33cb31418ce9a36c1"
+  integrity sha512-Ud6DJC4eiiQHDUi3BegW50gJfvUfbXTu9fqR/Hhj0s42PLDOfGzbIAFhz8AhiDNdzptZTsinITvESuKj12CIAA==
   dependencies:
-    "@rollup/plugin-commonjs" "^15.0.0"
-    "@rollup/plugin-json" "^4.0.0"
-    "@rollup/plugin-node-resolve" "^9.0.0"
-    ajv "^6.12.3"
+    "@rollup/plugin-commonjs" "^17.0.0"
+    "@rollup/plugin-json" "^4.1.0"
+    "@rollup/plugin-node-resolve" "^11.1.0"
+    ajv "^7.0.3"
     ansi-colors "^4.1.1"
     autoprefixer "^9.6.5"
-    browserslist "^4.7.0"
-    chokidar "^3.2.1"
-    commander "^6.0.0"
+    browserslist "^4.16.1"
+    chokidar "^3.5.1"
+    commander "^7.0.0"
     cssnano-preset-default "^4.0.7"
-    fs-extra "^9.0.0"
-    glob "^7.1.2"
-    injection-js "^2.2.1"
-    less "^3.10.3"
-    node-sass-tilde-importer "^1.0.0"
+    glob "^7.1.6"
+    injection-js "^2.4.0"
+    less "^4.1.0"
+    node-sass-tilde-importer "^1.0.2"
+    ora "^5.1.0"
     postcss "^7.0.29"
     postcss-url "^8.0.0"
     read-pkg-up "^5.0.0"
     rimraf "^3.0.0"
-    rollup "^2.8.0"
-    rollup-plugin-sourcemaps "^0.6.0"
+    rollup "^2.37.0"
+    rollup-plugin-sourcemaps "^0.6.3"
     rxjs "^6.5.0"
-    sass "^1.23.0"
-    stylus "^0.54.7"
-    terser "^5.0.0"
+    sass "^1.32.5"
+    stylus "^0.54.8"
+    terser "^5.5.1"
 
 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.4"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
-  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -8421,7 +8180,7 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
+node-fetch@^2.2.0, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -8436,6 +8195,22 @@ node-gyp-build@~4.1.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
   integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==
 
+node-gyp@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.3"
+    nopt "^5.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
+    rimraf "^3.0.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
+    which "^2.0.2"
+
 node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -8465,12 +8240,17 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.61:
-  version "1.1.61"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
-  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
+node-releases@^1.1.70:
+  version "1.1.70"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
+  integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
 
-node-sass-tilde-importer@^1.0.0:
+node-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-sass-tilde-importer@^1.0.2:
   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==
@@ -8490,7 +8270,14 @@ 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@^2.4.0, normalize-package-data@^2.5.0, "normalize-package-data@~1.0.1 || ^2.0.0":
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "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.5.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -8500,6 +8287,16 @@ 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-package-data@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
+  integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
+  dependencies:
+    hosted-git-info "^3.0.6"
+    resolve "^1.17.0"
+    semver "^7.3.2"
+    validate-npm-package-license "^3.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"
@@ -8517,27 +8314,17 @@ 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@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:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
 normalize-url@^3.0.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==
 
-normalize-url@^4.1.0:
+normalize-url@^4.1.0, normalize-url@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
   integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
 
-npm-bundled@^1.0.1, npm-bundled@^1.1.1:
+npm-bundled@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
   integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
@@ -8556,7 +8343,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@8.1.0:
+npm-package-arg@8.1.0, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.0.tgz#b5f6319418c3246a1c38e1a8fbaa06231bc5308f"
   integrity sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==
@@ -8565,7 +8352,7 @@ npm-package-arg@8.1.0:
     semver "^7.0.0"
     validate-npm-package-name "^3.0.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:
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
   integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
@@ -8575,28 +8362,10 @@ npm-package-arg@8.1.0:
     semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
-npm-package-arg@^8.0.0, npm-package-arg@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.0.1.tgz#9d76f8d7667b2373ffda60bb801a27ef71e3e270"
-  integrity sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==
-  dependencies:
-    hosted-git-info "^3.0.2"
-    semver "^7.0.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-packlist@^1.1.12:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
-npm-packlist@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.2.tgz#a3045b52aefc37e7a5e86a55e6ca8cb1e909e25a"
-  integrity sha512-eByPaP+wsKai0BJX5pmb58d3mfR0zUATcnyuvSxIudTEn+swCPFLxh7srCmqB4hr7i9V24/DPjjq5b2qUtbgXQ==
+npm-packlist@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.4.tgz#40e96b2b43787d0546a574542d01e066640d09da"
+  integrity sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw==
   dependencies:
     glob "^7.1.6"
     ignore-walk "^3.0.3"
@@ -8612,15 +8381,6 @@ npm-pick-manifest@6.1.0, npm-pick-manifest@^6.0.0:
     npm-package-arg "^8.0.0"
     semver "^7.0.0"
 
-npm-pick-manifest@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
-  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
-  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"
@@ -8640,23 +8400,10 @@ npm-registry-client@8.6.0:
   optionalDependencies:
     npmlog "2 || ^3.1.0 || ^4.0.0"
 
-npm-registry-fetch@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
-  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
-  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"
-    safe-buffer "^5.2.0"
-
-npm-registry-fetch@^8.0.0:
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz#438cc8f042f6c5309e9a91ad5ccb80d7f6ed47de"
-  integrity sha512-UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg==
+npm-registry-fetch@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
+  integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==
   dependencies:
     "@npmcli/ci-detect" "^1.0.0"
     lru-cache "^6.0.0"
@@ -8674,7 +8421,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@2 || ^3.1.0 || ^4.0.0":
+"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.1.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==
@@ -8691,6 +8438,13 @@ nth-check@^1.0.2:
   dependencies:
     boolbase "~1.0.0"
 
+nth-check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
+  integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+  dependencies:
+    boolbase "^1.0.0"
+
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -8716,11 +8470,6 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.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"
@@ -8730,10 +8479,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+object-inspect@^1.8.0, object-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
 object-inspect@~1.4.0:
   version "1.4.1"
@@ -8741,23 +8490,18 @@ object-inspect@~1.4.0:
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-is@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
-  integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
+  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-path@0.11.4:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
-  integrity sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -8765,23 +8509,24 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
 object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -8791,13 +8536,13 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 obuf@^1.0.0, obuf@^1.1.2:
@@ -8836,15 +8581,15 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69"
-  integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==
+open@7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b"
+  integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-opencollective-postinstall@^2.0.0, opencollective-postinstall@^2.0.2:
+opencollective-postinstall@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
   integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
@@ -8868,17 +8613,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-ora@5.1.0, ora@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8"
-  integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w==
+ora@5.3.0, ora@^5.0.0, ora@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f"
+  integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==
   dependencies:
+    bl "^4.0.3"
     chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-spinners "^2.4.0"
+    cli-spinners "^2.5.0"
     is-interactive "^1.0.0"
     log-symbols "^4.0.0"
-    mute-stream "0.0.8"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
@@ -8971,11 +8716,11 @@ p-limit@^2.0.0, p-limit@^2.2.0:
     p-try "^2.0.0"
 
 p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-try "^2.0.0"
+    yocto-queue "^0.1.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -8998,6 +8743,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -9034,70 +8786,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@11.1.4:
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.1.4.tgz#5529a453c59881b7f059da8af6903b0f79c124b2"
-  integrity sha512-eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==
+pacote@11.2.4:
+  version "11.2.4"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.2.4.tgz#dc7ca740a573ed86a3bf863511d22c1d413ec82f"
+  integrity sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==
   dependencies:
     "@npmcli/git" "^2.0.1"
     "@npmcli/installed-package-contents" "^1.0.5"
-    "@npmcli/promise-spawn" "^1.1.0"
-    cacache "^15.0.0"
-    chownr "^1.1.4"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.3.0"
+    cacache "^15.0.5"
+    chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.1"
-    minipass-fetch "^1.2.1"
+    minipass "^3.1.3"
     mkdirp "^1.0.3"
     npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.0"
+    npm-packlist "^2.1.4"
     npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^8.0.0"
-    promise-inflight "^1.0.1"
+    npm-registry-fetch "^9.0.0"
     promise-retry "^1.1.1"
     read-package-json-fast "^1.1.3"
-    rimraf "^2.7.1"
-    semver "^7.1.3"
+    rimraf "^3.0.2"
     ssri "^8.0.0"
-    tar "^6.0.1"
-    which "^2.0.2"
-
-pacote@9.5.12:
-  version "9.5.12"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66"
-  integrity sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==
-  dependencies:
-    bluebird "^3.5.3"
-    cacache "^12.0.2"
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-normalize-package-bin "^1.0.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^3.0.0"
-    npm-registry-fetch "^4.0.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.10"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
+    tar "^6.1.0"
 
 pako@^0.2.5:
   version "0.2.9"
@@ -9157,15 +8869,20 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
-  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-node-version@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse5-html-rewriting-stream@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b"
@@ -9174,6 +8891,13 @@ parse5-html-rewriting-stream@6.0.1:
     parse5 "^6.0.1"
     parse5-sax-parser "^6.0.1"
 
+parse5-htmlparser2-tree-adapter@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
 parse5-sax-parser@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba"
@@ -9196,30 +8920,6 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-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"
-
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-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"
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -9329,6 +9029,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
@@ -9392,13 +9097,6 @@ pkginfo@0.4.1:
   resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
   integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=
 
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  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"
@@ -9421,7 +9119,7 @@ popper.js@^1.14.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-portfinder@^1.0.25, portfinder@^1.0.26:
+portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
@@ -9444,6 +9142,14 @@ postcss-calc@^7.0.1:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.0.2"
 
+postcss-calc@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a"
+  integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==
+  dependencies:
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.2"
+
 postcss-colormin@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
@@ -9455,6 +9161,15 @@ postcss-colormin@^4.0.3:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-colormin@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.0.0.tgz#283b8934c8bdbc531e7648aeb0970107f6d06d0e"
+  integrity sha512-Yt84+5V6CgS/AhK7d7MA58vG8dSZ7+ytlRtWLaQhag3HXOncTfmYpuUOX4cDoXjvLfw1sHRCHMiBjYhc35CymQ==
+  dependencies:
+    browserslist "^4.16.0"
+    color "^3.1.1"
+    postcss-value-parser "^4.1.0"
+
 postcss-convert-values@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
@@ -9463,6 +9178,13 @@ postcss-convert-values@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-convert-values@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.0.tgz#cd77e1d23ebe8fcf508640551eed08e232784cba"
+  integrity sha512-V5kmYm4xoBAjNs+eHY/6XzXJkkGeg4kwNf2ocfqhLb1WBPEa4oaSmoi1fnVO7Dkblqvus9h+AenDvhCKUCK7uQ==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+
 postcss-discard-comments@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
@@ -9470,6 +9192,11 @@ postcss-discard-comments@^4.0.2:
   dependencies:
     postcss "^7.0.0"
 
+postcss-discard-comments@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.0.tgz#6c27310e0657c0b9e38a6175ad001b5aa28964bc"
+  integrity sha512-Umig6Gxs8m20RihiXY6QkePd6mp4FxkA1Dg+f/Kd6uw0gEMfKRjDeQOyFkLibexbJJGHpE3lrN/Q0R9SMrUMbQ==
+
 postcss-discard-duplicates@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
@@ -9477,6 +9204,11 @@ postcss-discard-duplicates@^4.0.2:
   dependencies:
     postcss "^7.0.0"
 
+postcss-discard-duplicates@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.0.tgz#6a2c4f779e8d20da6781e90730f234f9e650c51c"
+  integrity sha512-vEJJ+Y3pFUnO1FyCBA6PSisGjHtnphL3V6GsNvkASq/VkP3OX5/No5RYXXLxHa2QegStNzg6HYrYdo71uR4caQ==
+
 postcss-discard-empty@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
@@ -9484,6 +9216,11 @@ postcss-discard-empty@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
+postcss-discard-empty@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.0.tgz#0f0a9baee415f5f7be4ae046ba235e98626ba821"
+  integrity sha512-+wigy099Y1xZxG36WG5L1f2zeH1oicntkJEW4TDIqKKDO2g9XVB3OhoiHTu08rDEjLnbcab4rw0BAccwi2VjiQ==
+
 postcss-discard-overridden@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
@@ -9491,26 +9228,30 @@ postcss-discard-overridden@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-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==
+postcss-discard-overridden@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.0.tgz#ac00f695a60001eda52135a11fac87376b8da9ee"
+  integrity sha512-hybnScTaZM2iEA6kzVQ6Spozy7kVdLw+lGw8hftLlBEzt93uzXoltkYp9u0tI8xbfhxDLTOOzHsHQCkYdmzRUg==
+
+postcss-import@14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296"
+  integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==
   dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
+    postcss-value-parser "^4.0.0"
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-loader@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e"
-  integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw==
+postcss-loader@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4"
+  integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==
   dependencies:
     cosmiconfig "^7.0.0"
     klona "^2.0.4"
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
-    semver "^7.3.2"
+    semver "^7.3.4"
 
 postcss-merge-longhand@^4.0.11:
   version "4.0.11"
@@ -9522,6 +9263,15 @@ postcss-merge-longhand@^4.0.11:
     postcss-value-parser "^3.0.0"
     stylehacks "^4.0.0"
 
+postcss-merge-longhand@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.1.tgz#1a008ff72d14cd3e2f3d32accc2ad37948bcabf4"
+  integrity sha512-H1RO8le5deFGumQzuhJjuL0bIXPRysa+w7xtk5KrHe38oiaSS9ksPXDo24+IOS3SETPhip0J5+1uCOW+ALs3Yw==
+  dependencies:
+    css-color-names "^1.0.1"
+    postcss-value-parser "^4.1.0"
+    stylehacks "^5.0.0"
+
 postcss-merge-rules@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
@@ -9534,6 +9284,17 @@ postcss-merge-rules@^4.0.3:
     postcss-selector-parser "^3.0.0"
     vendors "^1.0.0"
 
+postcss-merge-rules@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.0.tgz#e0d0c0d45c98376f4adb49eb1f1dfe2aebfd7048"
+  integrity sha512-TfsXbKjNYCGfUPEXGIGPySnMiJbdS+3gcVeV8gwmJP4RajyKZHW8E0FYDL1WmggTj3hi+m+WUCAvqRpX2ut4Kg==
+  dependencies:
+    browserslist "^4.16.0"
+    caniuse-api "^3.0.0"
+    cssnano-utils "^2.0.0"
+    postcss-selector-parser "^6.0.4"
+    vendors "^1.0.3"
+
 postcss-minify-font-values@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
@@ -9542,6 +9303,13 @@ postcss-minify-font-values@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-minify-font-values@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.0.tgz#fee5d0fa192fae8757cb744870a0ad02be5f402e"
+  integrity sha512-zi2JhFaMOcIaNxhndX5uhsqSY1rexKDp23wV8EOmC9XERqzLbHsoRye3aYF716Zm+hkcR4loqKDt8LZlmihwAg==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+
 postcss-minify-gradients@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
@@ -9552,6 +9320,15 @@ postcss-minify-gradients@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-minify-gradients@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.0.tgz#95dbe61567a45c0cd7ab897d78fb65d5096844ed"
+  integrity sha512-/jPtNgs6JySMwgsE5dPOq8a2xEopWTW3RyqoB9fLqxgR+mDUNLSi7joKd+N1z7FXWgVkc4l/dEBMXHgNAaUbvg==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    is-color-stop "^1.1.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-minify-params@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
@@ -9564,6 +9341,17 @@ postcss-minify-params@^4.0.2:
     postcss-value-parser "^3.0.0"
     uniqs "^2.0.0"
 
+postcss-minify-params@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.0.tgz#12c7f75d69b0b4827fafbd6649970a53784a9c24"
+  integrity sha512-KvZYIxTPBVKjdd+XgObq9A+Sfv8lMkXTpbZTsjhr42XbfWIeLaTItMlygsDWfjArEc3muUfDaUFgNSeDiJ5jug==
+  dependencies:
+    alphanum-sort "^1.0.2"
+    browserslist "^4.16.0"
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+    uniqs "^2.0.0"
+
 postcss-minify-selectors@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
@@ -9574,6 +9362,14 @@ postcss-minify-selectors@^4.0.2:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
+postcss-minify-selectors@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.0.0.tgz#d3e43d97fd0ba83ba0010950fc5acfa420f7caa9"
+  integrity sha512-cEM0O0eWwFIvmo6nfB0lH0vO/XFwgqIvymODbfPXZ1gTA3i76FKnb7TGUrEpiTxaXH6tgYQ6DcTHwRiRS+YQLQ==
+  dependencies:
+    alphanum-sort "^1.0.2"
+    postcss-selector-parser "^3.1.2"
+
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -9609,6 +9405,11 @@ postcss-normalize-charset@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
+postcss-normalize-charset@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.0.tgz#59e1fe2094fb2e3371cc5b054cbc39828a41a710"
+  integrity sha512-pqsCkgo9KmQP0ew6DqSA+uP9YN6EfsW20pQ3JU5JoQge09Z6Too4qU0TNDsTNWuEaP8SWsMp+19l15210MsDZQ==
+
 postcss-normalize-display-values@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
@@ -9618,6 +9419,14 @@ postcss-normalize-display-values@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-display-values@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.0.tgz#4ff2d3b3b5146a366de28ec9e24131a1868f1933"
+  integrity sha512-t4f2d//gH1f7Ns0Jq3eNdnWuPT7TeLuISZ6RQx4j8gpl5XrhkdshdNcOnlrEK48YU6Tcb6jqK7dorME3N4oOGA==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-positions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
@@ -9628,6 +9437,13 @@ postcss-normalize-positions@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-positions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.0.tgz#fe1d9a8122dd385b9c6908bd2008140dea17750d"
+  integrity sha512-0o6/qU5ky74X/eWYj/tv4iiKCm3YqJnrhmVADpIMNXxzFZywsSQxl8F7cKs8jQEtF3VrJBgcDHTexZy1zgDoYg==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-repeat-style@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
@@ -9638,6 +9454,14 @@ postcss-normalize-repeat-style@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-repeat-style@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.0.tgz#e11d88fbf63f89179c6a7391853b2fe7f46e589d"
+  integrity sha512-KRT14JbrXKcFMYuc4q7lh8lvv8u22wLyMrq+UpHKLtbx2H/LOjvWXYdoDxmNrrrJzomAWL+ViEXr48/IhSUJnQ==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-string@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
@@ -9647,6 +9471,13 @@ postcss-normalize-string@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-string@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.0.tgz#2ea08ff4cb8817ce160755e9fdc7e6ef6d495002"
+  integrity sha512-wSO4pf7GNcDZpmelREWYADF1+XZWrAcbFLQCOqoE92ZwYgaP/RLumkUTaamEzdT2YKRZAH8eLLKGWotU/7FNPw==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-timing-functions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
@@ -9656,6 +9487,14 @@ postcss-normalize-timing-functions@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-timing-functions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.0.tgz#380eb1c9b179f96efc307c659a8049116f16f381"
+  integrity sha512-TwPaDX+wl9wO3MUm23lzGmOzGCGKnpk+rSDgzB2INpakD5dgWR3L6bJq1P1LQYzBAvz8fRIj2NWdnZdV4EV98Q==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-unicode@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
@@ -9665,6 +9504,14 @@ postcss-normalize-unicode@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-unicode@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.0.tgz#aa46a89c86ae51a01cbca13e73c1ed7b0b38807e"
+  integrity sha512-2CpVoz/67rXU5s9tsPZDxG1YGS9OFHwoY9gsLAzrURrCxTAb0H7Vp87/62LvVPgRWTa5ZmvgmqTp2rL8tlm72A==
+  dependencies:
+    browserslist "^4.16.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-url@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
@@ -9675,6 +9522,15 @@ postcss-normalize-url@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.0.tgz#626a4c7d30007f94466cdf245e7ed9f253f1dbd9"
+  integrity sha512-ICDaGFBqLgA3dlrCIRuhblLl80D13YtgEV9NJPTYJtgR72vu61KgxAHv+z/lKMs1EbwfSQa3ALjOFLSmXiE34A==
+  dependencies:
+    is-absolute-url "^3.0.3"
+    normalize-url "^4.5.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-normalize-whitespace@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
@@ -9683,6 +9539,13 @@ postcss-normalize-whitespace@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-normalize-whitespace@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.0.tgz#1faf147a4f8d3d93a3c75109d120b4eefa00589b"
+  integrity sha512-KRnxQvQAVkJfaeXSz7JlnD9nBN9sFZF9lrk9452Q2uRoqrRSkinqifF8Iex7wZGei2DZVG/qpmDFDmRvbNAOGA==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+
 postcss-ordered-values@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
@@ -9692,6 +9555,14 @@ postcss-ordered-values@^4.1.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-ordered-values@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.0.tgz#a50f224c5f40c566b338b0663655478737dcebee"
+  integrity sha512-dPr+SRObiHueCIc4IUaG0aOGQmYkuNu50wQvdXTGKy+rzi2mjmPsbeDsheLk5WPb9Zyf2tp8E+I+h40cnivm6g==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-reduce-initial@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
@@ -9702,6 +9573,14 @@ postcss-reduce-initial@^4.0.3:
     has "^1.0.0"
     postcss "^7.0.0"
 
+postcss-reduce-initial@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.0.tgz#c724e5513b0ae7f3d7bff16f0fc82133fb2f820a"
+  integrity sha512-wR6pXUaFbSMG1oCKx8pKVA+rnSXCHlca5jMrlmkmif+uig0HNUTV9oGN5kjKsM3mATQAldv2PF9Tbl2vqLFjnA==
+  dependencies:
+    browserslist "^4.16.0"
+    caniuse-api "^3.0.0"
+
 postcss-reduce-transforms@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
@@ -9712,7 +9591,15 @@ postcss-reduce-transforms@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-selector-parser@^3.0.0:
+postcss-reduce-transforms@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.0.tgz#5c820f71fbd4eec82b323523642b7b2d1c7d29ef"
+  integrity sha512-iHdGODW4YzM3WjVecBhPQt6fpJC4lGQZxJKjkBNHpp2b8dzmvj0ogKThqya+IRodQEFzjfXgYeESkf172FH5Lw==
+  dependencies:
+    cssnano-utils "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
+postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
   integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
@@ -9741,6 +9628,14 @@ postcss-svgo@^4.0.2:
     postcss-value-parser "^3.0.0"
     svgo "^1.0.0"
 
+postcss-svgo@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.0.tgz#c8d806e573394ab24f1e233cac5be4c199e9f1b2"
+  integrity sha512-M3/VS4sFI1Yp9g0bPL+xzzCNz5iLdRUztoFaugMit5a8sMfkVzzhwqbsOlD8IFFymCdJDmXmh31waYHWw1K4BA==
+  dependencies:
+    postcss-value-parser "^4.1.0"
+    svgo "^2.3.0"
+
 postcss-unique-selectors@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
@@ -9750,6 +9645,15 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
+postcss-unique-selectors@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.0.tgz#17856278f6c38d024defc9694d568bb09dd7f771"
+  integrity sha512-o9l4pF8SRn7aCMTmzb/kNv/kjV7wPZpZ8Nlb1Gq8v/Qvw969K1wanz1RVA0ehHzWe9+wHXaC2DvZlak/gdMJ5w==
+  dependencies:
+    alphanum-sort "^1.0.2"
+    postcss-selector-parser "^6.0.2"
+    uniqs "^2.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"
@@ -9761,17 +9665,17 @@ postcss-url@^8.0.0:
     postcss "^7.0.2"
     xxhashjs "^0.2.1"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3:
+postcss-value-parser@^3.0.0:
   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-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-"postcss@5 - 7", postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.29, postcss@^7.0.32:
+"postcss@5 - 7", postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.29, postcss@^7.0.32, postcss@^7.0.35:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -9780,48 +9684,47 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@7.0.21:
-  version "7.0.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
-  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
+postcss@8.2.15:
+  version "8.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
+  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
   dependencies:
-    chalk "^2.4.2"
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
     source-map "^0.6.1"
-    supports-color "^6.1.0"
 
-postcss@7.0.32:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+postcss@^8.1.4:
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04"
+  integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==
   dependencies:
-    chalk "^2.4.2"
+    colorette "^1.2.1"
+    nanoid "^3.1.20"
     source-map "^0.6.1"
-    supports-color "^6.1.0"
 
-postcss@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.1.tgz#c3a287dd10e4f6c84cb3791052b96a5d859c9389"
-  integrity sha512-9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg==
+postcss@^8.3.7:
+  version "8.3.11"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858"
+  integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==
   dependencies:
-    colorette "^1.2.1"
-    line-column "^1.0.2"
-    nanoid "^3.1.12"
-    source-map "^0.6.1"
+    nanoid "^3.1.30"
+    picocolors "^1.0.0"
+    source-map-js "^0.6.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.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 prettier@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
-  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+
+pretty-bytes@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e"
+  integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -9875,13 +9778,6 @@ protobufjs@6.8.8:
     "@types/node" "^10.1.0"
     long "^4.0.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.2:
   version "5.4.4"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.4.tgz#b241466aaf83b76bc2c58df67deb9a5cdfc61529"
@@ -9959,6 +9855,11 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
+puka@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/puka/-/puka-1.0.1.tgz#a2df782b7eb4cf9564e4c93a5da422de0dfacc02"
+  integrity sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g==
+
 pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@@ -9999,15 +9900,16 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.3.1.tgz#324e190d89f25ac33dba539f57b82a18553f8646"
-  integrity sha512-YTM1RaBeYrj6n7IlRXRYLqJHF+GM7tasbvrNFx6w1S16G76NrPq7oYFKLDO+BQsXNtS8kW2GxWCXjIMPvfDyaQ==
+puppeteer@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-6.0.0.tgz#6b73d7ba63c12abbb5080c2ffc14b55857cc62e2"
+  integrity sha512-LqDbNC7rp0JNH7BRTPjE3lCzGYD2tFqWBvRNukW4PjRP2YotWZWeLfFMTGrDHDFY5xjOceKBEbf8h45Xn6DFdw==
   dependencies:
     debug "^4.1.0"
-    devtools-protocol "0.0.799653"
+    devtools-protocol "0.0.842839"
     extract-zip "^2.0.0"
-    https-proxy-agent "^4.0.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.1"
     pkg-dir "^4.2.0"
     progress "^2.0.1"
     proxy-from-env "^1.0.0"
@@ -10041,14 +9943,6 @@ 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@^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:
-    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"
@@ -10064,17 +9958,12 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-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=
-
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-quicktype-core@^6.0.15:
+quicktype-core@^6.0.69:
   version "6.0.69"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-6.0.69.tgz#955347b64e8a7b6a37af49fe12f5772abc153b8e"
   integrity sha512-wKQ+/fwgdtFOcbeRiZkIBLA2ajvrFvmtTmexdv7PlO1dyp3C7Irbn2/HjwzalD1dYFrtMEYWohB/4rr3Mg75Xw==
@@ -10246,20 +10135,11 @@ read-pkg@^5.0.0, read-pkg@^5.2.0:
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
+    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"
 
 readable-stream@2.3.0:
   version "2.3.0"
@@ -10274,6 +10154,15 @@ readable-stream@2.3.0:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdir-scoped-modules@^1.0.0, readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
@@ -10293,10 +10182,10 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
-  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
   dependencies:
     picomatch "^2.2.1"
 
@@ -10315,14 +10204,6 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-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"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -10344,9 +10225,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@0.13.7, regenerator-runtime@^0.13.4:
   version "0.13.7"
@@ -10368,20 +10249,20 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regex-parser@2.2.10:
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
-  integrity sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==
+regex-parser@^2.2.11:
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
+  integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
 regexp.prototype.flags@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
 
-regexpu-core@^4.7.0:
+regexpu-core@^4.7.1:
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
   integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
@@ -10399,9 +10280,9 @@ regjsgen@^0.5.1:
   integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c"
+  integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -10500,6 +10381,11 @@ require-directory@^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.2:
+  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"
@@ -10532,20 +10418,15 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-url-loader@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz#28931895fa1eab9be0647d3b2958c100ae3c0bf0"
-  integrity sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==
-  dependencies:
-    adjust-sourcemap-loader "2.0.0"
-    camelcase "5.3.1"
-    compose-function "3.0.3"
-    convert-source-map "1.7.0"
-    es6-iterator "2.0.3"
-    loader-utils "1.2.3"
-    postcss "7.0.21"
-    rework "1.0.1"
-    rework-visit "1.0.0"
+resolve-url-loader@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57"
+  integrity sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==
+  dependencies:
+    adjust-sourcemap-loader "^4.0.0"
+    convert-source-map "^1.7.0"
+    loader-utils "^2.0.0"
+    postcss "^7.0.35"
     source-map "0.6.1"
 
 resolve-url@^0.2.1:
@@ -10553,11 +10434,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.17.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+resolve@1.19.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 responselike@^2.0.0:
@@ -10595,23 +10477,10 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rework-visit@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
-  integrity sha1-mUWygD8hni96ygCtuLyfZA+ELJo=
-
-rework@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
-  integrity sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=
-  dependencies:
-    convert-source-map "^0.3.3"
-    css "^2.0.0"
-
 rfdc@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
-  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949"
+  integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==
 
 rgb-regex@^1.0.1:
   version "1.0.1"
@@ -10630,7 +10499,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -10659,7 +10528,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-sourcemaps@^0.6.0:
+rollup-plugin-sourcemaps@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed"
   integrity sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==
@@ -10667,19 +10536,19 @@ rollup-plugin-sourcemaps@^0.6.0:
     "@rollup/pluginutils" "^3.0.9"
     source-map-resolve "^0.6.0"
 
-rollup@2.30.0:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.30.0.tgz#316a1eb0389dbda4082ef2d191b31488995e4c41"
-  integrity sha512-j4K1hUZfgFM03DUpayd3c7kZW+2wDbI6rj7ssQxpCpL1vsGpaM0vSorxBuePFwQDFq9O2DI6AOQbm174Awsq4w==
+rollup@2.38.4:
+  version "2.38.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea"
+  integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
-rollup@^2.8.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.29.0.tgz#0c5c5968530b21ca0e32f8b94b7cd9346cfb0eec"
-  integrity sha512-gtU0sjxMpsVlpuAf4QXienPmUAhd6Kc7owQ4f5lypoxBW18fw2UNYZ4NssLGsri6WhUZkE/Ts3EMRebN+gNLiQ==
+rollup@^2.37.0:
+  version "2.38.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.3.tgz#2a0b6cc6eab1da4431aab875a31a401fa2988c10"
+  integrity sha512-FVx/XzR2DtCozKNDBjHJCHIgkC12rNg/ruAeoYWjLeeKfSKgwhh+lDLDhuCkuRG/fsup8py8dKBTlHdvUFX32A==
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
 run-async@^2.4.0:
   version "2.4.1"
@@ -10687,9 +10556,9 @@ run-async@^2.4.0:
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -10732,10 +10601,10 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@10.0.3:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.3.tgz#9e2f1bfdd6355f2adde4e4835d838b020bf800b0"
-  integrity sha512-W4+FV5oUdYy0PnC11ZoPrcAexODgDCa3ngxoy5X5qBhZYoPz9FPjb6Oox8Aa0ZYEyx34k8AQfOVuvqefOSAAUQ==
+sass-loader@10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"
+  integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==
   dependencies:
     klona "^2.0.4"
     loader-utils "^2.0.0"
@@ -10743,16 +10612,23 @@ sass-loader@10.0.3:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@1.27.0, sass@^1.23.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2"
-  integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==
+sass@1.32.6:
+  version "1.32.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393"
+  integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
+sass@^1.32.5:
+  version "1.32.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.5.tgz#2882d22ad5748c05fa9bff6c3b0ffbc4f4b9e1dc"
+  integrity sha512-kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
-"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz":
+"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz":
   version "0.0.0"
-  resolved "https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz#7b7f35433af9c3380758e048894d7b9aecf3754e"
+  resolved "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz#992e2cb0d91e54b27a4f5bbd2049f3b774718115"
 
 saucelabs@^1.5.0:
   version "1.5.0"
@@ -10761,7 +10637,7 @@ saucelabs@^1.5.0:
   dependencies:
     https-proxy-agent "^2.2.1"
 
-sax@>=0.6.0, sax@~1.2.4:
+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==
@@ -10782,7 +10658,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.4, schema-utils@^2.6.5, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.7.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -10830,18 +10706,13 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.10.7:
+selfsigned@^1.10.8:
   version "1.10.8"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
   integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
   dependencies:
     node-forge "^0.10.0"
 
-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-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
@@ -10856,11 +10727,6 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-semver-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
-  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
-
 "semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -10871,20 +10737,22 @@ semver@5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@6.3.0, semver@^6.0.0, 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@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^6.0.0, 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==
 
 send@0.17.1:
   version "0.17.1"
@@ -11026,7 +10894,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shelljs@^0.8.3:
+shelljs@^0.8.3, shelljs@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -11092,97 +10960,55 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+socket.io-adapter@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527"
+  integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==
 
-socket.io-client@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
-  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    engine.io-client "~3.4.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.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199"
-  integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==
+socket.io-parser@~4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
+  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
   dependencies:
+    "@types/component-emitter" "^1.2.10"
     component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    isarray "2.0.1"
+    debug "~4.3.1"
 
-socket.io@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
-  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+socket.io@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.0.tgz#4f3accda31e95893f618090c9cb5e85d345421fb"
+  integrity sha512-Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==
   dependencies:
-    debug "~4.1.0"
-    engine.io "~3.4.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.3.0"
-    socket.io-parser "~3.4.0"
+    "@types/cookie" "^0.4.0"
+    "@types/cors" "^2.8.8"
+    "@types/node" "^14.14.10"
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    debug "~4.3.1"
+    engine.io "~4.1.0"
+    socket.io-adapter "~2.1.0"
+    socket.io-parser "~4.0.3"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+sockjs-client@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"
+  integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==
   dependencies:
-    debug "^3.2.5"
+    debug "^3.2.6"
     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"
+    faye-websocket "^0.11.3"
+    inherits "^2.0.4"
+    json3 "^3.3.3"
+    url-parse "^1.4.7"
 
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
+sockjs@^0.3.21:
+  version "0.3.21"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
+  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
   dependencies:
-    faye-websocket "^0.10.0"
+    faye-websocket "^0.11.3"
     uuid "^3.4.0"
-    websocket-driver "0.6.5"
-
-socks-proxy-agent@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
-  dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
+    websocket-driver "^0.7.4"
 
 socks-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -11194,37 +11020,27 @@ socks-proxy-agent@^5.0.0:
     socks "^2.3.3"
 
 socks@^2.3.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.4.4.tgz#f1a3382e7814ae28c97bb82a38bc1ac24b21cca2"
-  integrity sha512-7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.5.1.tgz#7720640b6b5ec9a07d556419203baa3f0596df5f"
+  integrity sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
 
-socks@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
-  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
-  dependencies:
-    ip "1.1.5"
-    smart-buffer "^4.1.0"
-
-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"
-
 source-list-map@^2.0.0, source-list-map@^2.0.1:
   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-map-loader@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.1.tgz#1dd964294cfcc3d9bab65f46af97a38d8ae0c65d"
-  integrity sha512-m2HjSWP2R1yR9P31e4+ciGHFOPvW6GmqHgZkneOkrME2VvWysXTGi4o0yS28iKWWP3vAUmAoa+3x5ZRI2BIX6A==
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+
+source-map-loader@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820"
+  integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==
   dependencies:
     abab "^2.0.5"
     iconv-lite "^0.6.2"
@@ -11252,14 +11068,6 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@0.5.16:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@0.5.19, source-map-support@^0.5.17, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
@@ -11346,9 +11154,9 @@ spdx-expression-validate@^2.0.0:
     spdx-expression-parse "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 spdx-ranges@^2.0.0:
   version "2.1.1"
@@ -11385,7 +11193,7 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
-spdy@^4.0.1, spdy@^4.0.2:
+spdy@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
@@ -11396,12 +11204,12 @@ spdy@^4.0.1, spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5"
-  integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==
+speed-measure-webpack-plugin@1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f"
+  integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==
   dependencies:
-    chalk "^2.0.1"
+    chalk "^4.1.0"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -11417,6 +11225,13 @@ split2@^2.0.0:
   dependencies:
     through2 "^2.0.2"
 
+split2@^3.0.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+  integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
+  dependencies:
+    readable-stream "^3.0.0"
+
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
@@ -11456,7 +11271,7 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
-ssri@^6.0.0, ssri@^6.0.1:
+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==
@@ -11464,9 +11279,9 @@ ssri@^6.0.0, ssri@^6.0.1:
     figgy-pudding "^3.5.1"
 
 ssri@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
-  integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
@@ -11572,11 +11387,6 @@ streamroller@^2.2.4:
     debug "^4.1.1"
     fs-extra "^8.1.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:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -11612,21 +11422,21 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
-string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -11701,11 +11511,6 @@ strip-indent@^1.0.1:
   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-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -11730,10 +11535,18 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-stylus-loader@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.1.1.tgz#0e94f5d6274932a2dad054d1a736b32146ac7a99"
-  integrity sha512-Vnm7J/nIs/P6swIrdwJW/dflhsCOiFmb1U3PeQ6phRtg1soPLN4uKnnL7AtGIJDe173elbtYIXVzmCyF493CfA==
+stylehacks@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.0.tgz#c49b0b2cf9917fe37dc030b96a4c34698b932933"
+  integrity sha512-QOWm6XivDLb+fqffTZP8jrmPmPITVChl2KCY2R05nsCWwLi3VGhCdVc3IVGNwd1zzTt1jPd67zIKjpQfxzQZeA==
+  dependencies:
+    browserslist "^4.16.0"
+    postcss-selector-parser "^6.0.4"
+
+stylus-loader@4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757"
+  integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==
   dependencies:
     fast-glob "^3.2.4"
     klona "^2.0.4"
@@ -11741,21 +11554,7 @@ stylus-loader@4.1.1:
     normalize-path "^3.0.0"
     schema-utils "^3.0.0"
 
-stylus@0.54.7:
-  version "0.54.7"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2"
-  integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==
-  dependencies:
-    css-parse "~2.0.0"
-    debug "~3.1.0"
-    glob "^7.1.3"
-    mkdirp "~0.5.x"
-    safer-buffer "^2.1.2"
-    sax "~1.2.4"
-    semver "^6.0.0"
-    source-map "^0.7.3"
-
-stylus@0.54.8, stylus@^0.54.7:
+stylus@0.54.8, stylus@^0.54.8:
   version "0.54.8"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
   integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
@@ -11769,6 +11568,11 @@ stylus@0.54.8, stylus@^0.54.7:
     semver "^6.3.0"
     source-map "^0.7.3"
 
+superstruct@^0.10.12:
+  version "0.10.13"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.10.13.tgz#705535a5598ff231bd976601a7b6b534a71a821b"
+  integrity sha512-W4SitSZ9MOyMPbHreoZVEneSZyPEeNGbdfJo/7FkJyRs/M3wQRFzq+t3S/NBwlrFSWdx1ONLjLb9pB+UKe4IqQ==
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -11814,10 +11618,23 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
-  integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
+svgo@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.3.0.tgz#6b3af81d0cbd1e19c83f5f63cec2cb98c70b5373"
+  integrity sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==
+  dependencies:
+    "@trysound/sax" "0.1.1"
+    chalk "^4.1.0"
+    commander "^7.1.0"
+    css-select "^3.1.2"
+    css-tree "^1.1.2"
+    csso "^4.2.0"
+    stable "^0.1.8"
+
+symbol-observable@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-3.0.0.tgz#eea8f6478c651018e059044268375c408c15c533"
+  integrity sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==
 
 symbol-tree@^3.2.2:
   version "3.2.4"
@@ -11829,25 +11646,25 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tapable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.0.0.tgz#a49c3d6a8a2bb606e7db372b82904c970d537a08"
-  integrity sha512-bjzn0C0RWoffnNdTzNi7rNDhs1Zlwk2tRXgk8EiHKAOX1Mag3d6T0Y5zNa7l9CJ+EoUne/0UHdwS8tMbkh9zDg==
+tapable@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
+  integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==
 
 tar-fs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"
-  integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
     pump "^3.0.0"
-    tar-stream "^2.0.0"
+    tar-stream "^2.1.4"
 
-tar-stream@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
-  integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
   dependencies:
     bl "^4.0.3"
     end-of-stream "^1.4.1"
@@ -11855,23 +11672,10 @@ tar-stream@^2.0.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^4.4.10:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-tar@^6.0.0, tar@^6.0.1, tar@^6.0.2:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
-  integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
+tar@^6.0.0, tar@^6.0.2, tar@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -11881,10 +11685,11 @@ tar@^6.0.0, tar@^6.0.1, tar@^6.0.2:
     yallist "^4.0.0"
 
 temp@^0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697"
-  integrity sha512-WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
   dependencies:
+    mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
 terser-webpack-plugin@4.2.3:
@@ -11917,10 +11722,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@5.3.5, terser@^5.0.0, terser@^5.3.4:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.5.tgz#9e080baa0568f96654621b20eb9effa440b1484e"
-  integrity sha512-Qw3CZAMmmfU824AoGKalx+riwocSI5Cs0PoGp9RdSLfmxkmJgyBxqLBP/isDNtFyhHnitikvRMZzyVgeq+U+Tg==
+terser@5.5.1, terser@^5.3.4, terser@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
+  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -11962,14 +11767,6 @@ through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
 through2@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -11988,9 +11785,9 @@ thunky@^1.0.2:
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
 timers-browserify@^2.0.4:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
-  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -12025,11 +11822,6 @@ tmp@^0.0.33:
   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"
@@ -12129,11 +11921,6 @@ trim-newlines@^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-newlines@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
@@ -12144,10 +11931,10 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-api-guardian@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.5.0.tgz#1b63546dfd61581054802bdc8d5915ceebcc2c35"
-  integrity sha512-BjVlb23FUqWU+wmdHkLdaHcllU+v/Cca26sY40bCkM15BCF2yc17daOm+UXyvxQ9NndPM/40m+X+GLyDkrE9tA==
+ts-api-guardian@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.6.0.tgz#9f44cf9bad1db5de358ccca7b4e6fb1d2c7fe462"
+  integrity sha512-DVA+UgPI1TVRI7GNDG1XBxwGs+cKqJq1os00txr52TUxBPwsUWWT7f83VHWvPQvh7G2wj93U/dTUBeDq3FIDTg==
   dependencies:
     chalk "^2.3.1"
     diff "^3.5.0"
@@ -12183,16 +11970,21 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tslib@2.0.3, tslib@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
+tslib@2.1.0, tslib@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
 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"
@@ -12277,10 +12069,10 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
 type-fest@^0.6.0:
   version "0.6.0"
@@ -12300,16 +12092,6 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
-  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
-
 typed-graphqlify@^2.3.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/typed-graphqlify/-/typed-graphqlify-2.4.5.tgz#e881f8a90911c32aec76a112e8e5077ead36e151"
@@ -12327,20 +12109,25 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.0.3, typescript@~4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
-  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
+typescript@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
+  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
+
+typescript@~4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
+  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
 
-ua-parser-js@0.7.22:
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
-  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+ua-parser-js@^0.7.23:
+  version "0.7.23"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
+  integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==
 
 uglify-js@^3.1.4:
-  version "3.11.2"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.2.tgz#9f50325544273c27b20e586def140e7726c525ea"
-  integrity sha512-G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg==
+  version "3.12.6"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.6.tgz#f884584fcc42e10bca70db5cb32e8625c2c42535"
+  integrity sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==
 
 unbzip2-stream@^1.3.3:
   version "1.4.3"
@@ -12441,11 +12228,6 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
-  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-
 unix-crypt-td-js@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz#4912dfad1c8aeb7d20fa0a39e4c31918c1d5d5dd"
@@ -12475,23 +12257,23 @@ upath@^1.1.1:
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.2.tgz#f9be09f00c4c5134b7cb3cf475c1dd394526265a"
-  integrity sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.5.tgz#119683ab4b2fb0bd637e5ea6dd9117bcac68d3e4"
+  integrity sha512-48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==
 
 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@^1.4.3:
+url-parse@^1.4.3, url-parse@^1.4.7:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
   integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
@@ -12556,20 +12338,20 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@8.3.1:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+uuid@8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.0, uuid@^3.3.2, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-to-istanbul@^4.1.2:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
-  integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
+v8-to-istanbul@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"
+  integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -12595,7 +12377,7 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vendors@^1.0.0:
+vendors@^1.0.0, vendors@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
@@ -12626,42 +12408,42 @@ verdaccio-htpasswd@9.7.2:
     http-errors "1.8.0"
     unix-crypt-td-js "1.1.4"
 
-verdaccio@4.8.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-4.8.1.tgz#49df0549d938915633797358f94ed774e294aa97"
-  integrity sha512-6I04bBlY4NS/MtRQismmIA+l/J0MJvBPj78s0p9QMATKDTcsdZS+zXf/Y6a/JsWYqz3fNp94YjV84bLjHrm4UA==
+verdaccio@4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-4.11.0.tgz#7211cdb34d9856e4c44f2956069dd541428c1785"
+  integrity sha512-9mNILk0MLcd1e2EHhHVQHaiAIqYxr828Bu9ZDDXBEEA1jRNDqkwqdqr2zFfaTb0rRAfAqiorq/VvB4pNyJXWHQ==
   dependencies:
     "@verdaccio/commons-api" "9.7.1"
-    "@verdaccio/local-storage" "9.7.2"
+    "@verdaccio/local-storage" "9.7.4"
     "@verdaccio/readme" "9.7.3"
     "@verdaccio/streams" "9.7.2"
-    "@verdaccio/ui-theme" "1.12.1"
+    "@verdaccio/ui-theme" "1.15.1"
     JSONStream "1.3.5"
     async "3.2.0"
     body-parser "1.19.0"
-    bunyan "1.8.14"
+    bunyan "1.8.15"
     commander "3.0.2"
     compression "1.7.4"
     cookies "0.8.0"
     cors "2.8.5"
-    dayjs "1.8.28"
-    envinfo "7.5.1"
+    dayjs "1.10.3"
+    envinfo "7.7.3"
     express "4.17.1"
     handlebars "4.7.6"
     http-errors "1.8.0"
-    js-yaml "3.14.0"
+    js-yaml "3.14.1"
     jsonwebtoken "8.5.1"
-    kleur "4.0.2"
-    lodash "4.17.19"
+    kleur "4.1.3"
+    lodash "4.17.20"
     lunr-mutable-indexes "2.3.2"
-    marked "1.1.1"
-    mime "2.4.6"
+    marked "1.2.7"
+    mime "2.5.0"
     minimatch "3.0.4"
     mkdirp "0.5.5"
     mv "2.1.1"
     pkginfo "0.4.1"
     request "2.88.0"
-    semver "6.3.0"
+    semver "7.3.4"
     verdaccio-audit "9.7.3"
     verdaccio-htpasswd "9.7.2"
 
@@ -12705,23 +12487,23 @@ w3c-xmlserializer@^1.1.2:
     webidl-conversions "^4.0.2"
     xml-name-validator "^3.0.0"
 
-watchpack-chokidar2@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
-  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
     chokidar "^2.1.8"
 
 watchpack@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
-  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
     chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.0"
+    watchpack-chokidar2 "^2.0.1"
 
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
@@ -12746,9 +12528,9 @@ webdriver-js-extender@2.1.0:
     selenium-webdriver "^3.0.1"
 
 webdriver-manager@^12.0.6, webdriver-manager@^12.1.7:
-  version "12.1.7"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
-  integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
+  version "12.1.8"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
+  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"
@@ -12767,7 +12549,7 @@ webidl-conversions@^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-dev-middleware@3.7.2, webpack-dev-middleware@^3.7.2:
+webpack-dev-middleware@3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
   integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
@@ -12778,51 +12560,23 @@ webpack-dev-middleware@3.7.2, webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.10.3:
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0"
-  integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==
+webpack-dev-middleware@^3.7.2:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
   dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    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"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.6"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.25"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
-    serve-index "^1.9.1"
-    sockjs "0.3.19"
-    sockjs-client "1.4.0"
-    spdy "^4.0.1"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "12.0.5"
 
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+webpack-dev-server@3.11.3:
+  version "3.11.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3"
+  integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==
   dependencies:
-    ansi-html "0.0.7"
+    ansi-html-community "0.0.8"
     bonjour "^3.5.0"
     chokidar "^2.1.8"
     compression "^1.7.4"
@@ -12842,11 +12596,11 @@ webpack-dev-server@3.11.0:
     p-retry "^3.0.1"
     portfinder "^1.0.26"
     schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
+    selfsigned "^1.10.8"
     semver "^6.3.0"
     serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
+    sockjs "^0.3.21"
+    sockjs-client "^1.5.0"
     spdy "^4.0.2"
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
@@ -12864,18 +12618,18 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9"
-  integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==
+webpack-merge@5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
+  integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f"
-  integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw==
+webpack-sources@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
+  integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
   dependencies:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
@@ -12888,10 +12642,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-subresource-integrity@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.0.tgz#3b90889c5a98e5b292f4652ece224632802e5cf1"
-  integrity sha512-d2VhJiaguyAUoQAphCfieTif4mn6bMrQqxPH4YL1PTJiyayzvkWH8xNEMis13ekH/o/KUO1OqO5khCgB43YHdA==
+webpack-subresource-integrity@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e"
+  integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==
   dependencies:
     webpack-sources "^1.3.0"
 
@@ -12924,14 +12678,7 @@ webpack@4.44.2:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
-websocket-driver@>=0.5.1:
+websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
@@ -12953,9 +12700,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
-  integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
+  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
 
 whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
   version "2.3.0"
@@ -12976,12 +12723,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-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
-which@^1.2.1, which@^1.2.9, which@^1.3.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==
@@ -13064,6 +12806,15 @@ wrap-ansi@^6.1.0, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -13076,17 +12827,10 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.0.0, ws@^7.1.2, ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
-
-ws@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^7.0.0, ws@^7.2.3, ws@~7.4.2:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
+  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
 
 xhr2@^0.2.0:
   version "0.2.0"
@@ -13121,11 +12865,6 @@ xmldom@^0.1.22:
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
   integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
 
-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=
-
 xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -13139,11 +12878,16 @@ xxhashjs@^0.2.1:
     cuint "^0.2.2"
 
 "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==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+
+y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -13174,7 +12918,7 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.0.0, yargs-parser@^18.1.0, yargs-parser@^18.1.2, yargs-parser@^18.1.3:
+yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -13182,7 +12926,17 @@ yargs-parser@^18.0.0, yargs-parser@^18.1.0, yargs-parser@^18.1.2, yargs-parser@^
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@12.0.5, yargs@^12.0.5:
+yargs-parser@^20.0.0:
+  version "20.2.6"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20"
+  integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==
+
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
+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==
@@ -13200,23 +12954,6 @@ yargs@12.0.5, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"
-  integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.0"
-
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -13233,7 +12970,7 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.0.0, yargs@^15.3.1, yargs@^15.4.1:
+yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
@@ -13250,6 +12987,19 @@ yargs@^15.0.0, yargs@^15.3.1, yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.0.0, yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -13258,11 +13008,6 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.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@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -13273,7 +13018,19 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-zone.js@^0.10.2, zone.js@~0.10.3:
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zone.js@^0.11.3:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.3.tgz#255a6313174731cc014d63233ef04fd9858da375"
+  integrity sha512-Y4hTHoh4VcxU5BDGAqEoOnOiyT254w6CiHtpQxAJUSMZPyVgdbKf+5R7Mwz6xsPhMIeBXk5rTopRZDpjssTCUg==
+  dependencies:
+    tslib "^2.0.0"
+
+zone.js@~0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
   integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==